From: Silvio Fricke <silvio.fricke@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: Silvio Fricke <silvio.fricke@gmail.com>
Subject: [PATCH 02/11] btrfs-progs: use calloc instead of malloc+memset for btrfs-list.c
Date: Tue, 29 Sep 2015 19:10:37 +0200 [thread overview]
Message-ID: <e9139a9dba401d7934fa061f9270903fa7ec68e1.1443546001.git.silvio.fricke@gmail.com> (raw)
In-Reply-To: <cover.1443546000.git.silvio.fricke@gmail.com>
In-Reply-To: <cover.1443546000.git.silvio.fricke@gmail.com>
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>
---
btrfs-list.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/btrfs-list.c b/btrfs-list.c
index d54de61..7529e11 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -226,13 +226,12 @@ struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void)
size = sizeof(struct btrfs_list_comparer_set) +
BTRFS_LIST_NCOMPS_INCREASE * sizeof(struct btrfs_list_comparer);
- set = malloc(size);
+ set = calloc(1, size);
if (!set) {
fprintf(stderr, "memory allocation failed\n");
exit(1);
}
- memset(set, 0, size);
set->total = BTRFS_LIST_NCOMPS_INCREASE;
return set;
@@ -474,12 +473,11 @@ static int add_root(struct root_lookup *root_lookup,
if (!ret)
return 0;
- ri = malloc(sizeof(*ri));
+ ri = calloc(1, sizeof(*ri));
if (!ri) {
printf("memory allocation failed\n");
exit(1);
}
- memset(ri, 0, sizeof(*ri));
ri->root_id = root_id;
if (name && name_len > 0) {
@@ -1208,13 +1206,12 @@ struct btrfs_list_filter_set *btrfs_list_alloc_filter_set(void)
size = sizeof(struct btrfs_list_filter_set) +
BTRFS_LIST_NFILTERS_INCREASE * sizeof(struct btrfs_list_filter);
- set = malloc(size);
+ set = calloc(1, size);
if (!set) {
fprintf(stderr, "memory allocation failed\n");
exit(1);
}
- memset(set, 0, size);
set->total = BTRFS_LIST_NFILTERS_INCREASE;
return set;
--
2.5.3
next prev parent reply other threads:[~2015-09-29 17:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1443459879.git.silvio.fricke@gmail.com>
2015-09-29 17:10 ` [PATCH 00/11] using of calloc instead of malloc+memset Silvio Fricke
2015-09-30 16:48 ` David Sterba
2015-09-30 16:54 ` David Sterba
2015-09-29 17:10 ` [PATCH 01/11] btrfs-progs: use calloc instead of malloc+memset for btrfs-image.c Silvio Fricke
2015-09-29 17:10 ` Silvio Fricke [this message]
2015-09-29 17:10 ` [PATCH 03/11] btrfs-progs: use calloc instead of malloc+memset for chunk-recover.c Silvio Fricke
2015-09-29 17:10 ` [PATCH 04/11] btrfs-progs: use calloc instead of malloc+memset for cmds-check.c Silvio Fricke
2015-09-29 17:10 ` [PATCH 05/11] btrfs-progs: use calloc instead of malloc+memset for disk-io.c Silvio Fricke
2015-09-29 17:10 ` [PATCH 06/11] btrfs-progs: use calloc instead of malloc+memset for extent_io.c Silvio Fricke
2015-09-29 17:10 ` [PATCH 07/11] btrfs-progs: use calloc instead of malloc+memset for mkfs.c Silvio Fricke
2015-09-29 17:10 ` [PATCH 08/11] btrfs-progs: use calloc instead of malloc+memset for qgroup.c Silvio Fricke
2015-09-29 17:10 ` [PATCH 09/11] btrfs-progs: use calloc instead of malloc+memset for quick-test.c Silvio Fricke
2015-09-29 17:10 ` [PATCH 10/11] btrfs-progs: use calloc instead of malloc+memset for volumes.c Silvio Fricke
2015-09-29 17:10 ` [PATCH 11/11] btrfs-progs: check: fix memset range Silvio Fricke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9139a9dba401d7934fa061f9270903fa7ec68e1.1443546001.git.silvio.fricke@gmail.com \
--to=silvio.fricke@gmail.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).