From fe6bb60ffdf0f57d9b4c1e9b4a587226402105ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sun, 26 Mar 2000 16:18:12 +0200
Subject: [PATCH] Changed some debug_malloc_touch() to debug_malloc_pass() for
clarity.
Rev: src/dmalloc.h:1.22
Rev: src/dynamic_buffer.h:1.8
Rev: src/object.h:1.38
Rev: src/pike_types.c:1.129
---
src/dmalloc.h | 4 ++--
src/dynamic_buffer.h | 8 ++++----
src/object.h | 4 ++--
src/pike_types.c | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/dmalloc.h b/src/dmalloc.h
index 68bfea26fb..7ca0e1b802 100644
--- a/src/dmalloc.h
+++ b/src/dmalloc.h
@@ -1,5 +1,5 @@
/*
- * $Id: dmalloc.h,v 1.21 2000/03/21 03:20:48 mast Exp $
+ * $Id: dmalloc.h,v 1.22 2000/03/26 14:17:30 grubba Exp $
*/
extern char *debug_xalloc(long);
@@ -51,7 +51,7 @@ void debug_malloc_copy_names(void *p, void *p2);
#define DO_IF_DMALLOC(X) X
#define debug_malloc_touch(X) debug_malloc_update_location((X),DMALLOC_LOCATION())
#define debug_malloc_pass(X) debug_malloc_update_location((X),DMALLOC_LOCATION())
-#define xalloc(X) ((char *)debug_malloc_touch(debug_xalloc(X)))
+#define xalloc(X) ((char *)debug_malloc_pass(debug_xalloc(X)))
void debug_malloc_dump_references(void *x);
#define dmalloc_touch(TYPE,X) ((TYPE)debug_malloc_update_location((X),DMALLOC_LOCATION()))
#define dmalloc_touch_svalue(X) do { struct svalue *_tmp = (X); if ((X)->type <= MAX_REF_TYPE) { debug_malloc_touch(_tmp->u.refs); } } while(0)
diff --git a/src/dynamic_buffer.h b/src/dynamic_buffer.h
index 675728fc94..1283c221f3 100644
--- a/src/dynamic_buffer.h
+++ b/src/dynamic_buffer.h
@@ -5,7 +5,7 @@
\*/
/*
- * $Id: dynamic_buffer.h,v 1.7 2000/03/20 21:00:04 hubbe Exp $
+ * $Id: dynamic_buffer.h,v 1.8 2000/03/26 14:18:12 grubba Exp $
*/
#ifndef DYNAMIC_BUFFER_H
#define DYNAMIC_BUFFER_H
@@ -54,13 +54,13 @@ char *debug_return_buf(void);
do { dynamic_buffer *b_=(X); debug_initialize_buf(b_); \
debug_malloc_touch(b_->s.str); } while(0)
#define low_free_buf(X) \
- ((struct pike_string *)debug_malloc_touch(debug_low_free_buf(X)))
+ ((struct pike_string *)debug_malloc_pass(debug_low_free_buf(X)))
#define free_buf() \
- ((struct pike_string *)debug_malloc_touch(debug_free_buf()))
+ ((struct pike_string *)debug_malloc_pass(debug_free_buf()))
#define return_buf() \
- ((char *)debug_malloc_touch(debug_return_buf()))
+ ((char *)debug_malloc_pass(debug_return_buf()))
#else
#define initialize_buf debug_initialize_buf
diff --git a/src/object.h b/src/object.h
index 523afae343..019dffd3fe 100644
--- a/src/object.h
+++ b/src/object.h
@@ -5,7 +5,7 @@
\*/
/*
- * $Id: object.h,v 1.37 2000/02/17 00:31:13 hubbe Exp $
+ * $Id: object.h,v 1.38 2000/03/26 14:16:42 grubba Exp $
*/
#ifndef OBJECT_H
#define OBJECT_H
@@ -109,7 +109,7 @@ void check_all_objects(void);
/* Prototypes end here */
#ifdef DEBUG_MALLOC
-#define clone_object(X,Y) ((struct object *)debug_malloc_touch(debug_clone_object((X),(Y))))
+#define clone_object(X,Y) ((struct object *)debug_malloc_pass(debug_clone_object((X),(Y))))
#else
#define clone_object debug_clone_object
#endif
diff --git a/src/pike_types.c b/src/pike_types.c
index 522765f5a2..894558edb4 100644
--- a/src/pike_types.c
+++ b/src/pike_types.c
@@ -5,7 +5,7 @@
\*/
/**/
#include "global.h"
-RCSID("$Id: pike_types.c,v 1.128 2000/03/23 19:05:08 grubba Exp $");
+RCSID("$Id: pike_types.c,v 1.129 2000/03/26 14:16:11 grubba Exp $");
#include <ctype.h>
#include "svalue.h"
#include "pike_types.h"
@@ -2602,7 +2602,7 @@ int pike_types_le(struct pike_string *a,struct pike_string *b)
#ifdef DEBUG_MALLOC
-#define low_index_type(X,Y,Z) ((struct pike_string *)debug_malloc_touch(debug_low_index_type((X),(Y),(Z))))
+#define low_index_type(X,Y,Z) ((struct pike_string *)debug_malloc_pass(debug_low_index_type((X),(Y),(Z))))
#else
#define low_index_type debug_low_index_type
#endif
@@ -2826,7 +2826,7 @@ struct pike_string *array_value_type(struct pike_string *array_type)
#ifdef DEBUG_MALLOC
-#define low_key_type(X,Y) ((struct pike_string *)debug_malloc_touch(debug_low_key_type((X),(Y))))
+#define low_key_type(X,Y) ((struct pike_string *)debug_malloc_pass(debug_low_key_type((X),(Y))))
#else
#define low_key_type debug_low_key_type
#endif
--
GitLab