From: Ted Lemon <source@isc.org>
Date: Thu, 27 Jan 2000 22:17:54 +0000 (+0000)
Subject: Move malloc debug information out of option_state_dereferencers.
X-Git-Tag: V3-BETA-2-PATCH-1~388
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ceebd91905911a0f00412c52824ec8bdf97b0a;p=thirdparty%2Fdhcp.git

Move malloc debug information out of option_state_dereferencers.
---

diff --git a/common/alloc.c b/common/alloc.c
index a5ebb7f41..7f55eff92 100644
--- a/common/alloc.c
+++ b/common/alloc.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: alloc.c,v 1.39 2000/01/26 17:20:16 mellon Exp $ Copyright (c) 1995, 1996, 1998 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: alloc.c,v 1.40 2000/01/27 22:14:36 mellon Exp $ Copyright (c) 1995, 1996, 1998 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -817,8 +817,7 @@ int option_state_dereference (ptr, file, line)
 		if (options -> universes [i] &&
 		    universes [i] -> option_state_dereference)
 			((*(universes [i] -> option_state_dereference))
-			 (universes [i], options));
-
+			 (universes [i], options, file, line));
 	dfree (options, file, line);
 	return 1;
 }
diff --git a/includes/tree.h b/includes/tree.h
index 1efc851c6..32484acc2 100644
--- a/includes/tree.h
+++ b/includes/tree.h
@@ -216,7 +216,8 @@ struct universe {
 	void (*delete_func) PROTO ((struct universe *universe,
 				    struct option_state *, int));
 	int (*option_state_dereference) PROTO ((struct universe *,
-						struct option_state *));
+						struct option_state *,
+						const char *, int));
 	int (*encapsulate) PROTO ((struct data_string *, struct packet *,
 				   struct lease *, struct option_state *,
 				   struct option_state *,