From 081e38483ec55dcfca3d92434fe94f0777ed962d Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 3 Aug 2006 20:07:35 +0000 Subject: Remove xcalloc() and convert its callers to xzalloc(). About half of them were using "1" as one of the arguments anyway, and as for the rest a multiply and a push isn't noticeably bigger than pushing two arguments on the stack. --- coreutils/cut.c | 4 ++-- coreutils/ls.c | 2 +- coreutils/sort.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'coreutils') diff --git a/coreutils/cut.c b/coreutils/cut.c index 98fdb5356..1b80e7e73 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -135,7 +135,7 @@ static void cut_line_by_chars(const char *line) { int c, l; /* set up a list so we can keep track of what's been printed */ - char *printed = xcalloc(strlen(line), sizeof(char)); + char *printed = xzalloc(strlen(line)); /* print the chars specified in each cut list */ for (c = 0; c < nlists; c++) { @@ -172,7 +172,7 @@ static void cut_line_by_fields(char *line) } /* set up a list so we can keep track of what's been printed */ - printed = xcalloc(strlen(line), sizeof(char)); + printed = xzalloc(strlen(line)); /* process each list on this line, for as long as we've got a line to process */ for (c = 0; c < nlists && line; c++) { diff --git a/coreutils/ls.c b/coreutils/ls.c index 6b9fbbfc9..828127a4a 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -300,7 +300,7 @@ static struct dnode **dnalloc(int num) if (num < 1) return (NULL); - p = (struct dnode **) xcalloc((size_t) num, (size_t) (sizeof(struct dnode *))); + p = (struct dnode **) xzalloc(num * sizeof(struct dnode *)); return (p); } diff --git a/coreutils/sort.c b/coreutils/sort.c index 195e13d13..ea7752d2a 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -120,7 +120,7 @@ static struct sort_key *add_key(void) { struct sort_key **pkey=&key_list; while(*pkey) pkey=&((*pkey)->next_key); - return *pkey=xcalloc(1,sizeof(struct sort_key)); + return *pkey = xzalloc(sizeof(struct sort_key)); } #define GET_LINE(fp) (global_flags&FLAG_z) ? bb_get_chunk_from_file(fp,NULL) \ -- cgit v1.2.3