aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-08-03 20:07:35 +0000
committerRob Landley <rob@landley.net>2006-08-03 20:07:35 +0000
commit081e38483ec55dcfca3d92434fe94f0777ed962d (patch)
tree2d31e921a759c769f339055c9946205fabef5cbf /shell
parent86b4d64aa3f5ca4c2824a8948541b0e18dfe0a74 (diff)
downloadbusybox-w32-081e38483ec55dcfca3d92434fe94f0777ed962d.tar.gz
busybox-w32-081e38483ec55dcfca3d92434fe94f0777ed962d.tar.bz2
busybox-w32-081e38483ec55dcfca3d92434fe94f0777ed962d.zip
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 'shell')
-rw-r--r--shell/cmdedit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 0af1a2ad0..03aaa3b2e 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -311,7 +311,7 @@ static void parse_prompt(const char *prmt_ptr)
311 int prmt_len = 0; 311 int prmt_len = 0;
312 size_t cur_prmt_len = 0; 312 size_t cur_prmt_len = 0;
313 char flg_not_length = '['; 313 char flg_not_length = '[';
314 char *prmt_mem_ptr = xcalloc(1, 1); 314 char *prmt_mem_ptr = xzalloc(1);
315 char *pwd_buf = xgetcwd(0); 315 char *pwd_buf = xgetcwd(0);
316 char buf2[PATH_MAX + 1]; 316 char buf2[PATH_MAX + 1];
317 char buf[2]; 317 char buf[2];
@@ -344,7 +344,7 @@ static void parse_prompt(const char *prmt_ptr)
344 case 'h': 344 case 'h':
345 pbuf = hostname_buf; 345 pbuf = hostname_buf;
346 if (pbuf == 0) { 346 if (pbuf == 0) {
347 pbuf = xcalloc(256, 1); 347 pbuf = xzalloc(256);
348 if (gethostname(pbuf, 255) < 0) { 348 if (gethostname(pbuf, 255) < 0) {
349 strcpy(pbuf, "?"); 349 strcpy(pbuf, "?");
350 } else { 350 } else {