undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace xmalloc+memset(0) with xcalloc.

Browse Source 
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Peter Eriksen 2006-04-03 19:30:46 +01:00 committed by Junio C Hamano
parent 8e44025925
commit 90321c106c
10 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apply.c
View File

@ -925,8 +925,7 @@ static int parse_single_patch(char *line, unsigned long size, struct patch *patc
struct fragment *fragment; struct fragment *fragment;
int len; int len;
fragment = xmalloc(sizeof(*fragment)); fragment = xcalloc(1, sizeof(*fragment));
memset(fragment, 0, sizeof(*fragment));
len = parse_fragment(line, size, patch, fragment); len = parse_fragment(line, size, patch, fragment);
if (len <= 0) if (len <= 0)
die("corrupt patch at line %d", linenr); die("corrupt patch at line %d", linenr);
@ -1652,8 +1651,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
if (!write_index) if (!write_index)
return; return;
ce = xmalloc(ce_size); ce = xcalloc(1, ce_size);
memset(ce, 0, ce_size);
memcpy(ce->name, path, namelen); memcpy(ce->name, path, namelen);
ce->ce_mode = create_ce_mode(mode); ce->ce_mode = create_ce_mode(mode);
ce->ce_flags = htons(namelen); ce->ce_flags = htons(namelen);
@ -1809,8 +1807,7 @@ static int apply_patch(int fd, const char *filename)
struct patch *patch; struct patch *patch;
int nr; int nr;
patch = xmalloc(sizeof(*patch)); patch = xcalloc(1, sizeof(*patch));
memset(patch, 0, sizeof(*patch));
nr = parse_chunk(buffer + offset, size, patch); nr = parse_chunk(buffer + offset, size, patch);
if (nr < 0) if (nr < 0)
break; break;

3
blob.c
View File

@ -8,8 +8,7 @@ struct blob *lookup_blob(const unsigned char *sha1)
{ {
struct object *obj = lookup_object(sha1); struct object *obj = lookup_object(sha1);
if (!obj) { if (!obj) {
struct blob *ret = xmalloc(sizeof(struct blob)); struct blob *ret = xcalloc(1, sizeof(struct blob));
memset(ret, 0, sizeof(struct blob));
created_object(sha1, &ret->object); created_object(sha1, &ret->object);
ret->object.type = blob_type; ret->object.type = blob_type;
return ret; return ret;

3
commit.c
View File

@ -73,8 +73,7 @@ struct commit *lookup_commit(const unsigned char *sha1)
{ {
struct object *obj = lookup_object(sha1); struct object *obj = lookup_object(sha1);
if (!obj) { if (!obj) {
struct commit *ret = xmalloc(sizeof(struct commit)); struct commit *ret = xcalloc(1, sizeof(struct commit));
memset(ret, 0, sizeof(struct commit));
created_object(sha1, &ret->object); created_object(sha1, &ret->object);
ret->object.type = commit_type; ret->object.type = commit_type;
return ret; return ret;

3
convert-objects.c
View File

@ -21,8 +21,7 @@ static struct entry * convert_entry(unsigned char *sha1);
static struct entry *insert_new(unsigned char *sha1, int pos) static struct entry *insert_new(unsigned char *sha1, int pos)
{ {
struct entry *new = xmalloc(sizeof(struct entry)); struct entry *new = xcalloc(1, sizeof(struct entry));
memset(new, 0, sizeof(*new));
memcpy(new->old_sha1, sha1, 20); memcpy(new->old_sha1, sha1, 20);
memmove(convert + pos + 1, convert + pos, (nr_convert - pos) * sizeof(struct entry *)); memmove(convert + pos + 1, convert + pos, (nr_convert - pos) * sizeof(struct entry *));
convert[pos] = new; convert[pos] = new;

6
http-push.c
View File

@ -1008,8 +1008,7 @@ static int fetch_indices(void)
struct active_request_slot *slot; struct active_request_slot *slot;
struct slot_results results; struct slot_results results;
data = xmalloc(4096); data = xcalloc(1, 4096);
memset(data, 0, 4096);
buffer.size = 4096; buffer.size = 4096;
buffer.posn = 0; buffer.posn = 0;
buffer.buffer = data; buffer.buffer = data;
@ -2042,8 +2041,7 @@ static void update_remote_info_refs(struct remote_lock *lock)
char *if_header; char *if_header;
struct curl_slist *dav_headers = NULL; struct curl_slist *dav_headers = NULL;
buffer.buffer = xmalloc(4096); buffer.buffer = xcalloc(1, 4096);
memset(buffer.buffer, 0, 4096);
buffer.size = 4096; buffer.size = 4096;
buffer.posn = 0; buffer.posn = 0;
remote_ls("refs/", (PROCESS_FILES | RECURSIVE), remote_ls("refs/", (PROCESS_FILES | RECURSIVE),

6
object.c
View File

@ -85,8 +85,7 @@ struct object_refs *alloc_object_refs(unsigned count)
struct object_refs *refs; struct object_refs *refs;
size_t size = sizeof(*refs) + count*sizeof(struct object *); size_t size = sizeof(*refs) + count*sizeof(struct object *);
refs = xmalloc(size); refs = xcalloc(1, size);
memset(refs, 0, size);
refs->count = count; refs->count = count;
return refs; return refs;
} }
@ -178,8 +177,7 @@ struct object *lookup_unknown_object(const unsigned char *sha1)
{ {
struct object *obj = lookup_object(sha1); struct object *obj = lookup_object(sha1);
if (!obj) { if (!obj) {
union any_object *ret = xmalloc(sizeof(*ret)); union any_object *ret = xcalloc(1, sizeof(*ret));
memset(ret, 0, sizeof(*ret));
created_object(sha1, &ret->object); created_object(sha1, &ret->object);
ret->object.type = NULL; ret->object.type = NULL;
return &ret->object; return &ret->object;

9
read-tree.c
View File

@ -133,11 +133,9 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
pathlen = strlen(first); pathlen = strlen(first);
ce_size = cache_entry_size(baselen + pathlen); ce_size = cache_entry_size(baselen + pathlen);
src = xmalloc(sizeof(struct cache_entry *) * src_size); src = xcalloc(src_size, sizeof(struct cache_entry *));
memset(src, 0, sizeof(struct cache_entry *) * src_size);
subposns = xmalloc(sizeof(struct tree_list_entry *) * len); subposns = xcalloc(len, sizeof(struct tree_list_entry *));
memset(subposns, 0, sizeof(struct tree_list_entry *) * len);
if (cache_name && !strcmp(cache_name, first)) { if (cache_name && !strcmp(cache_name, first)) {
any_files = 1; any_files = 1;
@ -177,8 +175,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
else else
ce_stage = 2; ce_stage = 2;
ce = xmalloc(ce_size); ce = xcalloc(1, ce_size);
memset(ce, 0, ce_size);
ce->ce_mode = create_ce_mode(posns[i]->mode); ce->ce_mode = create_ce_mode(posns[i]->mode);
ce->ce_flags = create_ce_flags(baselen + pathlen, ce->ce_flags = create_ce_flags(baselen + pathlen,
ce_stage); ce_stage);

3
tag.c
View File

@ -19,8 +19,7 @@ struct tag *lookup_tag(const unsigned char *sha1)
{ {
struct object *obj = lookup_object(sha1); struct object *obj = lookup_object(sha1);
if (!obj) { if (!obj) {
struct tag *ret = xmalloc(sizeof(struct tag)); struct tag *ret = xcalloc(1, sizeof(struct tag));
memset(ret, 0, sizeof(struct tag));
created_object(sha1, &ret->object); created_object(sha1, &ret->object);
ret->object.type = tag_type; ret->object.type = tag_type;
return ret; return ret;

7
tree.c
View File

@ -18,9 +18,7 @@ static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
len = strlen(pathname); len = strlen(pathname);
size = cache_entry_size(baselen + len); size = cache_entry_size(baselen + len);
ce = xmalloc(size); ce = xcalloc(1, size);
memset(ce, 0, size);
ce->ce_mode = create_ce_mode(mode); ce->ce_mode = create_ce_mode(mode);
ce->ce_flags = create_ce_flags(baselen + len, stage); ce->ce_flags = create_ce_flags(baselen + len, stage);
@ -130,8 +128,7 @@ struct tree *lookup_tree(const unsigned char *sha1)
{ {
struct object *obj = lookup_object(sha1); struct object *obj = lookup_object(sha1);
if (!obj) { if (!obj) {
struct tree *ret = xmalloc(sizeof(struct tree)); struct tree *ret = xcalloc(1, sizeof(struct tree));
memset(ret, 0, sizeof(struct tree));
created_object(sha1, &ret->object); created_object(sha1, &ret->object);
ret->object.type = tree_type; ret->object.type = tree_type;
return ret; return ret;

6
update-index.c
View File

@ -114,8 +114,7 @@ static int add_file_to_cache(const char *path)
namelen = strlen(path); namelen = strlen(path);
size = cache_entry_size(namelen); size = cache_entry_size(namelen);
ce = xmalloc(size); ce = xcalloc(1, size);
memset(ce, 0, size);
memcpy(ce->name, path, namelen); memcpy(ce->name, path, namelen);
ce->ce_flags = htons(namelen); ce->ce_flags = htons(namelen);
fill_stat_cache_info(ce, &st); fill_stat_cache_info(ce, &st);
@ -312,8 +311,7 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
len = strlen(path); len = strlen(path);
size = cache_entry_size(len); size = cache_entry_size(len);
ce = xmalloc(size); ce = xcalloc(1, size);
memset(ce, 0, size);
memcpy(ce->sha1, sha1, 20); memcpy(ce->sha1, sha1, 20);
memcpy(ce->name, path, len); memcpy(ce->name, path, len);