mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace xmalloc/memset(0) pairs with xcalloc

Browse Source 
Many call sites immediately initialize allocated memory with zero after
calling xmalloc. A single call to xcalloc can replace this two-call
sequence.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Brandon Casey
2008-10-06 18:39:10 -05:00
committed by Shawn O. Pearce
parent 276328ffb8
commit 19d4b416f4
5 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-merge.c
View File

@ -123,8 +123,7 @@ static struct strategy *get_strategy(const char *name)
exit(1);
}
ret = xmalloc(sizeof(struct strategy));
memset(ret, 0, sizeof(struct strategy));
ret = xcalloc(1, sizeof(struct strategy));
ret->name = xstrdup(name);
return ret;
}

4
builtin-pack-objects.c
View File

@ -1369,12 +1369,10 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
int window, int depth, unsigned *processed)
{
uint32_t i, idx = 0, count = 0;
unsigned int array_size = window * sizeof(struct unpacked);
struct unpacked *array;
unsigned long mem_usage = 0;
array = xmalloc(array_size);
memset(array, 0, array_size);
array = xcalloc(window, sizeof(struct unpacked));
for (;;) {
struct object_entry *entry = *list++;

3
builtin-unpack-objects.c
View File

@ -477,8 +477,7 @@ static void unpack_all(void)
if (!quiet)
progress = start_progress("Unpacking objects", nr_objects);
obj_list = xmalloc(nr_objects * sizeof(*obj_list));
memset(obj_list, 0, nr_objects * sizeof(*obj_list));
obj_list = xcalloc(nr_objects, sizeof(*obj_list));
for (i = 0; i < nr_objects; i++) {
unpack_one(i);
display_progress(progress, i + 1);

3
merge-tree.c
View File

@ -158,9 +158,8 @@ static int same_entry(struct name_entry *a, struct name_entry *b)
static struct merge_list *create_entry(unsigned stage, unsigned mode, const unsigned char *sha1, const char *path)
{
struct merge_list *res = xmalloc(sizeof(*res));
struct merge_list *res = xcalloc(1, sizeof(*res));
memset(res, 0, sizeof(*res));
res->stage = stage;
res->path = path;
res->mode = mode;

3
remote.c
View File

@ -751,8 +751,7 @@ int remote_find_tracking(struct remote *remote, struct refspec *refspec)
struct ref *alloc_ref(unsigned namelen)
{
struct ref *ret = xmalloc(sizeof(struct ref) + namelen);
memset(ret, 0, sizeof(struct ref) + namelen);
struct ref *ret = xcalloc(1, sizeof(struct ref) + namelen);
return ret;
}