Use calloc() instead of malloc + memset

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/iolog.c b/iolog.c
index ef8b84145db0e14f808bdb53539184011b44975b..cfcab2712d1026e20a71c27dcc2428a1a76923f2 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -539,9 +539,9 @@ int init_iolog(struct thread_data *td)
 void setup_log(struct io_log **log, struct log_params *p,
               const char *filename)
 {
-       struct io_log *l = malloc(sizeof(*l));
+       struct io_log *l;
 
-       memset(l, 0, sizeof(*l));
+       l = calloc(1, sizeof(*l));
        l->nr_samples = 0;
        l->max_samples = 1024;
        l->log_type = p->log_type;

diff --git a/json.c b/json.c
index 7480a61fa98939519f3306fa583977fd8d331f40..6145ee489dbd2c6077dfa3a8913fa3935cc49c0c 100644 (file)
--- a/json.c
+++ b/json.c
@@ -8,18 +8,12 @@
 
 struct json_object *json_create_object(void)
 {
-       struct json_object *obj = malloc(sizeof(struct json_object));
-       if (obj)
-               memset(obj, 0, sizeof(struct json_object));
-       return obj;
+       return calloc(1, sizeof(struct json_object));
 }
 
 struct json_array *json_create_array(void)
 {
-       struct json_array *array = malloc(sizeof(struct json_array));
-       if (array)
-               memset(array, 0, sizeof(struct json_array));
-       return array;
+       return calloc(1, sizeof(struct json_array));
 }
 
 static struct json_pair *json_create_pair(const char *name, struct json_value *value)