mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 22:05:23 +00:00
Code Issues Releases Wiki Activity

[master] Remove some incorrect #ifdefs

Browse Source 
As part of 33990 we removed some #ifdefs for DEBUG_MEMORY
but we didn't get all of them.  Remove the extra ones.
This commit is contained in:
Shawn Routhier
2016-01-07 11:35:44 -08:00
parent cacce092a4
commit 75ab52e12b
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELNOTES
View File

@@ -111,6 +111,7 @@ by Eric Young (eay@cryptsoft.com).
host objects. Thanks to Jiri Popelka at Red Hat for reporting host objects. Thanks to Jiri Popelka at Red Hat for reporting
the issue and supplying the patches. the issue and supplying the patches.
[ISC-Bugs #33990] [ISC-Bugs #33990]
[ISC-Bugs #41325]
- Cleaned up some of the Make infrastructure to make --with-libbind - Cleaned up some of the Make infrastructure to make --with-libbind
work better. Though it still only works with an absolute path. work better. Though it still only works with an absolute path.

7
includes/dhcpd.h
View File

@@ -3,7 +3,7 @@
Definitions for dhcpd... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * 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 * based on which is in use to allow the code to be cleaner by
* avoiding #ifdefs. * avoiding #ifdefs.
* *
* POOL_DESTROYP is used for debugging purposes * POOL_DESTROYP is used for cleanup
*/ */
#if !defined (BINARY_LEASES) #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_first_lease(struct leasechain *lc);
struct lease *lc_get_next(struct leasechain *lc, struct lease *lp); struct lease *lc_get_next(struct leasechain *lc, struct lease *lp);
void lc_init_growth(struct leasechain *lc, size_t growth); 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); void lc_delete_all(struct leasechain *lc);
#endif
#endif /* BINARY_LEASES */ #endif /* BINARY_LEASES */
#define MAX_ADDRESS_STRING_LEN \ #define MAX_ADDRESS_STRING_LEN \

5
server/leasechain.c
View File

@@ -3,7 +3,7 @@
Additional support for in-memory database support */ 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 * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * 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); 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 * \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->total = 0;
lc->nelem = 0; lc->nelem = 0;
} }
#endif
/*! /*!
* *