[Libguestfs] [PATCH] btrfs: use calloc instead of malloc+memset

Pino Toscano ptoscano at redhat.com
Tue Jun 16 15:33:47 UTC 2015


Small optimization, and eases the code.
---
 daemon/btrfs.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index f02acb1..7b14bac 100644
--- a/daemon/btrfs.c
+++ b/daemon/btrfs.c
@@ -1723,12 +1723,11 @@ do_btrfs_balance_status (const char *path)
 
   nlines = count_strings (lines);
 
-  ret = malloc(sizeof *ret);
+  ret = calloc (1, sizeof *ret);
   if (ret == NULL) {
-    reply_with_perror ("malloc");
+    reply_with_perror ("calloc");
     goto error;
   }
-  memset (ret, 0, sizeof(*ret));
 
   /* Output of `btrfs balance status' is like:
    *
@@ -1850,12 +1849,11 @@ do_btrfs_scrub_status (const char *path)
     return NULL;
   }
 
-  ret = malloc (sizeof *ret);
+  ret = calloc (1, sizeof *ret);
   if (ret == NULL) {
-    reply_with_perror ("malloc");
+    reply_with_perror ("calloc");
     return NULL;
   }
-  memset (ret, 0, sizeof(*ret));
 
   /* Output of `btrfs scrub -R status' is like:
    *
-- 
2.1.0




More information about the Libguestfs mailing list