From: Andreas Schwab Date: Tue, 12 Apr 2011 10:20:32 +0000 (+0200) Subject: * alloc.c (overrun_check_malloc, overrun_check_realloc) X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~283^2~15 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7974947bc66f311e3883bb19aec11f3fe4dc7f6;p=emacs.git * alloc.c (overrun_check_malloc, overrun_check_realloc) (overrun_check_free): Protoize. --- diff --git a/src/ChangeLog b/src/ChangeLog index 3006d08a33e..b1e17766f37 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-04-12 Andreas Schwab + + * alloc.c (overrun_check_malloc, overrun_check_realloc) + (overrun_check_free): Protoize. + 2011-04-12 Paul Eggert * sysdep.c (emacs_read, emacs_write): Check for negative sizes diff --git a/src/alloc.c b/src/alloc.c index 54c4760abab..6a018b87029 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -559,8 +559,7 @@ static int check_depth; /* Like malloc, but wraps allocated block with header and trailer. */ POINTER_TYPE * -overrun_check_malloc (size) - size_t size; +overrun_check_malloc (size_t size) { register unsigned char *val; size_t overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_SIZE*2 : 0; @@ -584,11 +583,9 @@ overrun_check_malloc (size) with header and trailer. */ POINTER_TYPE * -overrun_check_realloc (block, size) - POINTER_TYPE *block; - size_t size; +overrun_check_realloc (POINTER_TYPE *block, size_t size) { - register unsigned char *val = (unsigned char *)block; + register unsigned char *val = (unsigned char *) block; size_t overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_SIZE*2 : 0; if (val @@ -624,10 +621,9 @@ overrun_check_realloc (block, size) /* Like free, but checks block for overrun. */ void -overrun_check_free (block) - POINTER_TYPE *block; +overrun_check_free (POINTER_TYPE *block) { - unsigned char *val = (unsigned char *)block; + unsigned char *val = (unsigned char *) block; ++check_depth; if (val