diff options
| author |   krw <krw@openbsd.org> | 2010-01-01 20:46:19 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2010-01-01 20:46:19 +0000 |
| commit | 92b98df2642671e37934594be83501db45926dc8 (patch) | |
| tree | 0e3fca173892fd717bdd3d8459d8c0ad6194e4ea /usr.sbin/dhcpd/tree.c | |
| parent | Wrappers around a wrapper around free() are of no more use than (diff) | |
| download | wireguard-openbsd-92b98df2642671e37934594be83501db45926dc8.tar.xz wireguard-openbsd-92b98df2642671e37934594be83501db45926dc8.zip | |
Eliminate all uses of dfree() where the pointer is either dereferenced
immediately before the use or the pointer is checked for NULL before
the call. And then there were none, so kill dfree().
Diffstat (limited to 'usr.sbin/dhcpd/tree.c')
| -rw-r--r-- | usr.sbin/dhcpd/tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/dhcpd/tree.c b/usr.sbin/dhcpd/tree.c index e42e36bc3b6..8d9614bab5e 100644 --- a/usr.sbin/dhcpd/tree.c +++ b/usr.sbin/dhcpd/tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.c,v 1.13 2010/01/01 20:30:25 krw Exp $ */ +/* $OpenBSD: tree.c,v 1.14 2010/01/01 20:46:20 krw Exp $ */ /* Routines for manipulating parse trees... */ @@ -118,8 +118,8 @@ tree_concat(struct tree *left, struct tree *right) left->data.const_val.len); memcpy(buf + left->data.const_val.len, right->data.const_val.data, right->data.const_val.len); - dfree(left->data.const_val.data, "tree_concat"); - dfree(right->data.const_val.data, "tree_concat"); + free(left->data.const_val.data); + free(right->data.const_val.data); left->data.const_val.data = buf; left->data.const_val.len += right->data.const_val.len; free(right); @@ -207,7 +207,7 @@ tree_evaluate(struct tree_cache *tree_cache) * location and size and return. */ if (tree_cache->value) - dfree(tree_cache->value, "tree_evaluate"); + free(tree_cache->value); tree_cache->value = bp; tree_cache->len = bufix; tree_cache->buf_size = bc; |