diff options
| author | Silvio Fricke <silvio.fricke@gmail.com> | 2015-09-29 19:10:36 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2015-10-21 14:29:26 +0200 |
| commit | c47a831cd653fa4ef4979ae7007e60037eddcb37 (patch) | |
| tree | 69d07646892cda8a71072e8b7920a6afac6ccaec /chunk-recover.c | |
| parent | 9c89f637a3d754ac401b7b6dabe5c7b8c336f848 (diff) | |
| download | btrfs-progs-c47a831cd653fa4ef4979ae7007e60037eddcb37.tar.gz | |
btrfs-progs: use calloc instead of malloc+memset
This patch is generated from a coccinelle semantic patch:
identifier t;
expression e;
statement s;
@@
-t = malloc(e);
+t = calloc(1, e);
(
if (!t) s
|
if (t == NULL) s
|
)
-memset(t, 0, e);
Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
[squashed patches into one]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'chunk-recover.c')
| -rw-r--r-- | chunk-recover.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chunk-recover.c b/chunk-recover.c index 1fb04f7..d0ca920 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -85,13 +85,12 @@ static struct extent_record *btrfs_new_extent_record(struct extent_buffer *eb) { struct extent_record *rec; - rec = malloc(sizeof(*rec)); + rec = calloc(1, sizeof(*rec)); if (!rec) { fprintf(stderr, "Fail to allocate memory for extent record.\n"); exit(1); } - memset(rec, 0, sizeof(*rec)); rec->cache.start = btrfs_header_bytenr(eb); rec->cache.size = eb->len; rec->generation = btrfs_header_generation(eb); @@ -2228,10 +2227,9 @@ static int btrfs_recover_chunks(struct recover_control *rc) nstripes = btrfs_get_device_extents(bg->objectid, &rc->devext.no_chunk_orphans, &devexts); - chunk = malloc(btrfs_chunk_record_size(nstripes)); + chunk = calloc(1, btrfs_chunk_record_size(nstripes)); if (!chunk) return -ENOMEM; - memset(chunk, 0, btrfs_chunk_record_size(nstripes)); INIT_LIST_HEAD(&chunk->dextents); chunk->bg_rec = bg; chunk->cache.start = bg->objectid; |