From 3f4ba2e98d21746723d291939ccc2e1f1526aa6d Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 16 Jun 2015 17:31:43 +0200 Subject: [PATCH] btrfs: use calloc instead of malloc+memset 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 f02acb101..7b14bac82 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: *