aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2011-04-12 12:20:32 +0200
committerAndreas Schwab2011-04-12 12:20:32 +0200
commite7974947bc66f311e3883bb19aec11f3fe4dc7f6 (patch)
tree638ca02636b21c33557afab06fc4101083e15f0e
parent718ad21a5b6a8200e00cd0037ea2db5c1f6133cc (diff)
downloademacs-e7974947bc66f311e3883bb19aec11f3fe4dc7f6.tar.gz
emacs-e7974947bc66f311e3883bb19aec11f3fe4dc7f6.zip
* alloc.c (overrun_check_malloc, overrun_check_realloc)
(overrun_check_free): Protoize.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloc.c14
2 files changed, 10 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3006d08a33e..b1e17766f37 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-04-12 Andreas Schwab <schwab@linux-m68k.org>
2
3 * alloc.c (overrun_check_malloc, overrun_check_realloc)
4 (overrun_check_free): Protoize.
5
12011-04-12 Paul Eggert <eggert@cs.ucla.edu> 62011-04-12 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * sysdep.c (emacs_read, emacs_write): Check for negative sizes 8 * 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;
559/* Like malloc, but wraps allocated block with header and trailer. */ 559/* Like malloc, but wraps allocated block with header and trailer. */
560 560
561POINTER_TYPE * 561POINTER_TYPE *
562overrun_check_malloc (size) 562overrun_check_malloc (size_t size)
563 size_t size;
564{ 563{
565 register unsigned char *val; 564 register unsigned char *val;
566 size_t overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_SIZE*2 : 0; 565 size_t overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_SIZE*2 : 0;
@@ -584,11 +583,9 @@ overrun_check_malloc (size)
584 with header and trailer. */ 583 with header and trailer. */
585 584
586POINTER_TYPE * 585POINTER_TYPE *
587overrun_check_realloc (block, size) 586overrun_check_realloc (POINTER_TYPE *block, size_t size)
588 POINTER_TYPE *block;
589 size_t size;
590{ 587{
591 register unsigned char *val = (unsigned char *)block; 588 register unsigned char *val = (unsigned char *) block;
592 size_t overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_SIZE*2 : 0; 589 size_t overhead = ++check_depth == 1 ? XMALLOC_OVERRUN_CHECK_SIZE*2 : 0;
593 590
594 if (val 591 if (val
@@ -624,10 +621,9 @@ overrun_check_realloc (block, size)
624/* Like free, but checks block for overrun. */ 621/* Like free, but checks block for overrun. */
625 622
626void 623void
627overrun_check_free (block) 624overrun_check_free (POINTER_TYPE *block)
628 POINTER_TYPE *block;
629{ 625{
630 unsigned char *val = (unsigned char *)block; 626 unsigned char *val = (unsigned char *) block;
631 627
632 ++check_depth; 628 ++check_depth;
633 if (val 629 if (val