diff options
| author | Rob Landley <rob@landley.net> | 2006-08-03 20:07:35 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-08-03 20:07:35 +0000 |
| commit | 081e38483ec55dcfca3d92434fe94f0777ed962d (patch) | |
| tree | 2d31e921a759c769f339055c9946205fabef5cbf /findutils | |
| parent | 86b4d64aa3f5ca4c2824a8948541b0e18dfe0a74 (diff) | |
| download | busybox-081e38483ec55dcfca3d92434fe94f0777ed962d.tar.gz | |
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.
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/grep.c | 2 | ||||
| -rw-r--r-- | findutils/xargs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index b53bf490a..c2c4e7095 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -321,7 +321,7 @@ int grep_main(int argc, char **argv) lines_before = 0; lines_after = 0; } else if(lines_before > 0) - before_buf = (char **)xcalloc(lines_before, sizeof(char *)); + before_buf = (char **)xzalloc(lines_before * sizeof(char *)); } #else /* with auto sanity checks */ diff --git a/findutils/xargs.c b/findutils/xargs.c index e46708303..d067a3f48 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -503,7 +503,7 @@ int xargs_main(int argc, char **argv) /* allocating pointers for execvp: a*arg, n*arg from stdin, NULL */ - args = xcalloc(n + a + 1, sizeof(char *)); + args = xzalloc((n + a + 1) * sizeof(char *)); /* Store the command to be executed (taken from the command line) */ |