From 2e94c4530460ddbbe83590c7ea01e1128e36c126 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 28 Mar 2001 23:21:43 +0000 Subject: [PATCH] * config/pa/xm-hppah.h (malloc): Really delete declaration (MALLOC_INCOMPATIBLE): Really delete macro. * cli/cli-cmds.c (apropos_command): Use xcalloc. --- gdb/ChangeLog | 6 ++++++ gdb/cli/cli-cmds.c | 2 +- gdb/config/pa/xm-hppah.h | 7 ------- gdb/mi/ChangeLog | 4 ++++ gdb/mi/mi-main.c | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2e470d4de41..62487dd23f5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2001-03-28 Andrew Cagney + + * config/pa/xm-hppah.h (malloc): Really delete declaration + (MALLOC_INCOMPATIBLE): Really delete macro. + * cli/cli-cmds.c (apropos_command): Use xcalloc. + 2001-03-28 Andrew Cagney * configure.in (build_warnings): Add -Wuninitialized. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 41001e9ed31..c1c5f7b747e 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -542,7 +542,7 @@ apropos_command (char *searchstr, int from_tty) regex_t pattern; char *pattern_fastmap; char errorbuffer[512]; - pattern_fastmap=calloc(256,sizeof(char)); + pattern_fastmap = xcalloc (256, sizeof (char)); if (searchstr == NULL) error("REGEXP string is empty"); diff --git a/gdb/config/pa/xm-hppah.h b/gdb/config/pa/xm-hppah.h index 796b17af24c..bb212187afa 100644 --- a/gdb/config/pa/xm-hppah.h +++ b/gdb/config/pa/xm-hppah.h @@ -30,10 +30,3 @@ #define USG #define HAVE_TERMIOS - -/* HP defines malloc and realloc as returning void *, even for non-ANSI - compilations (such as with the native compiler). */ - -#define MALLOC_INCOMPATIBLE - -extern void *malloc (size_t); diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog index 6065a4f9515..1c8aa783d33 100644 --- a/gdb/mi/ChangeLog +++ b/gdb/mi/ChangeLog @@ -1,3 +1,7 @@ +2001-03-28 Andrew Cagney + + * mi-main.c (mi_cmd_data_read_memory): Use xcalloc. + 2001-03-26 Eli Zaretskii * gdbmi.texinfo: Update copyright. Change Permissions to GFDL. diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index a7c23c0cd13..06638bf3aa1 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -859,7 +859,7 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc) /* create a buffer and read it in. */ total_bytes = word_size * nr_rows * nr_cols; - mbuf = calloc (total_bytes, 1); + mbuf = xcalloc (total_bytes, 1); make_cleanup (xfree, mbuf); if (mbuf == NULL) { -- 2.30.2