Move malloc debug information out of option_state_dereferencers.

diff --git a/common/alloc.c b/common/alloc.c
index a5ebb7f41fc863cc6fbcb6a42d9d3ea7bb9b08e6..7f55eff920d995734731545f6a94fc9826f49851 100644 (file)
--- 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 1efc851c6612057235f73560b1a44661f0aff598..32484acc239890ff8921174151a9a01f75b8517c 100644 (file)
--- 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 *,