diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-01-01 20:46:21 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-01-01 20:46:21 +0000 |
| commit | 9b171e6d5ef9680dc42a8e1f5ba78ffa30c4b5de (patch) | |
| tree | a3926271156ef35c718597c5fe53a0f0a354f1a7 /usr.sbin/dhcpd/options.c | |
| parent | 70851fc3b8f8519297ae742736b560f88a290afe (diff) | |
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/options.c')
| -rw-r--r-- | usr.sbin/dhcpd/options.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/dhcpd/options.c b/usr.sbin/dhcpd/options.c index 10dc064d996..4f008fb3cae 100644 --- a/usr.sbin/dhcpd/options.c +++ b/usr.sbin/dhcpd/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.24 2008/11/14 02:00:08 krw Exp $ */ +/* $OpenBSD: options.c,v 1.25 2010/01/01 20:46:20 krw Exp $ */ /* DHCP options parsing and reassembly. */ @@ -187,8 +187,7 @@ parse_option_buffer(struct packet *packet, &s[2], len); packet->options[code].len += len; t[packet->options[code].len] = 0; - dfree(packet->options[code].data, - "parse_option_buffer"); + free(packet->options[code].data); packet->options[code].data = t; } s += len + 2; @@ -518,5 +517,5 @@ do_packet(struct interface_info *interface, struct dhcp_packet *packet, /* Free the data associated with the options. */ for (i = 0; i < 256; i++) if (tp.options[i].len && tp.options[i].data) - dfree(tp.options[i].data, "do_packet"); + free(tp.options[i].data); } |