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.


git-svn-id: svn://busybox.net/trunk/busybox@15771 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 3 insertions, 3 deletions

diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index afb6f0c7d..99ffed1c5 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -877,8 +877,8 @@ static void compile_fs_type(char *fs_type, struct fs_type_compile *cmp)
                 }
         }
 
-        cmp->list = xcalloc(num, sizeof(char *));
-        cmp->type = xcalloc(num, sizeof(int));
+        cmp->list = xzalloc(num * sizeof(char *));
+        cmp->type = xzalloc(num * sizeof(int));
         cmp->negate = 0;
 
         if (!fs_type)
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index ea6afb92c..687f18567 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -401,7 +401,7 @@ static errcode_t zero_blocks(ext2_filsys fs, blk_t blk, int num,
         }
         /* Allocate the zeroizing buffer if necessary */
         if (!buf) {
-                buf = xcalloc(fs->blocksize, STRIDE_LENGTH);
+                buf = xzalloc(fs->blocksize * STRIDE_LENGTH);
         }
         /* OK, do the write loop */
         next_update = 0;