diff options
| author | Shawn Routhier <sar@isc.org> | 2016-01-07 11:35:44 -0800 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2016-01-07 11:35:44 -0800 |
| commit | 75ab52e12ba75ecdbe8f79c15bb614260999741c (patch) | |
| tree | 44871a7b3ad1deea4b856231bf85fc5a34380cd4 | |
| parent | cacce092a434cf5a8d581ada72c7b12217dbe10b (diff) | |
| download | isc-dhcp-75ab52e12ba75ecdbe8f79c15bb614260999741c.tar.gz | |
[master] Remove some incorrect #ifdefs
As part of 33990 we removed some #ifdefs for DEBUG_MEMORY
but we didn't get all of them. Remove the extra ones.
| -rw-r--r-- | RELNOTES | 1 | ||||
| -rw-r--r-- | includes/dhcpd.h | 7 | ||||
| -rw-r--r-- | server/leasechain.c | 5 |
3 files changed, 4 insertions, 9 deletions
@@ -111,6 +111,7 @@ by Eric Young (eay@cryptsoft.com). host objects. Thanks to Jiri Popelka at Red Hat for reporting the issue and supplying the patches. [ISC-Bugs #33990] + [ISC-Bugs #41325] - Cleaned up some of the Make infrastructure to make --with-libbind work better. Though it still only works with an absolute path. diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 1cf66d33..230df59f 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -3,7 +3,7 @@ Definitions for dhcpd... */ /* - * Copyright (c) 2004-2015 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -237,7 +237,7 @@ typedef time_t TIME; * based on which is in use to allow the code to be cleaner by * avoiding #ifdefs. * - * POOL_DESTROYP is used for debugging purposes + * POOL_DESTROYP is used for cleanup */ #if !defined (BINARY_LEASES) @@ -3757,10 +3757,7 @@ void lc_unlink_lease(struct leasechain *lc, struct lease *lp); struct lease *lc_get_first_lease(struct leasechain *lc); struct lease *lc_get_next(struct leasechain *lc, struct lease *lp); void lc_init_growth(struct leasechain *lc, size_t growth); -#if defined (DEBUG_MEMORY_LEAKAGE) || \ - defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT) void lc_delete_all(struct leasechain *lc); -#endif #endif /* BINARY_LEASES */ #define MAX_ADDRESS_STRING_LEN \ diff --git a/server/leasechain.c b/server/leasechain.c index d394526d..bf6a2bf9 100644 --- a/server/leasechain.c +++ b/server/leasechain.c @@ -3,7 +3,7 @@ Additional support for in-memory database support */ /* - * Copyright (c) 2015 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2015-2016 by Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -647,8 +647,6 @@ lc_unlink_lease(struct leasechain *lc, struct lease *lp) { lc_unlink_lease_pos(lc, pos); } -#if defined (DEBUG_MEMORY_LEAKAGE) || \ - defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT) /*! * * \brief Unlink all the leases in the lease chain and free the @@ -677,7 +675,6 @@ lc_delete_all(struct leasechain *lc) { lc->total = 0; lc->nelem = 0; } -#endif /*! * |