From 9037787eaee5efb58fd46f326397193b16b161dd Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 8 Jan 2010 09:07:50 +0100 Subject: *: fix places where we were still using malloc/realloc Signed-off-by: Denys Vlasenko --- editors/ed.c | 19 +++---------------- editors/sed.c | 2 +- 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'editors') diff --git a/editors/ed.c b/editors/ed.c index 9ce8bea..516b8d7 100644 --- a/editors/ed.c +++ b/editors/ed.c @@ -454,11 +454,7 @@ static void subCommand(const char *cmd, int num1, int num2) * structure and use that. Link it in in place of * the old line structure. */ - nlp = malloc(sizeof(LINE) + lp->len + deltaLen); - if (nlp == NULL) { - bb_error_msg("can't get memory for line"); - return; - } + nlp = xmalloc(sizeof(LINE) + lp->len + deltaLen); nlp->len = lp->len + deltaLen; @@ -712,12 +708,7 @@ static int readLines(const char *file, int num) if (bufUsed >= bufSize) { len = (bufSize * 3) / 2; - cp = realloc(bufBase, len); - if (cp == NULL) { - bb_error_msg("no memory for buffer"); - close(fd); - return FALSE; - } + cp = xrealloc(bufBase, len); bufBase = cp; bufPtr = bufBase + bufUsed; bufSize = len; @@ -872,11 +863,7 @@ static int insertLine(int num, const char *data, int len) return FALSE; } - newLp = malloc(sizeof(LINE) + len - 1); - if (newLp == NULL) { - bb_error_msg("failed to allocate memory for line"); - return FALSE; - } + newLp = xmalloc(sizeof(LINE) + len - 1); memcpy(newLp->data, data, len); newLp->len = len; diff --git a/editors/sed.c b/editors/sed.c index 19e7683..fd9dd1b 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -1094,7 +1094,7 @@ static void process_files(void) /* append next_line, read new next_line. */ } len = strlen(pattern_space); - pattern_space = realloc(pattern_space, len + strlen(next_line) + 2); + pattern_space = xrealloc(pattern_space, len + strlen(next_line) + 2); pattern_space[len] = '\n'; strcpy(pattern_space + len+1, next_line); last_gets_char = next_gets_char; -- cgit v1.1