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

avoid asking ?alloc() for zero bytes.

Browse Source 
Avoid asking for zero bytes when that change simplifies overall
logic.  Later we would change the wrapper to ask for 1 byte on
platforms that return NULL for zero byte request.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-12-26 12:34:56 -08:00
parent 7d6fb370bc
commit 7e4a2a8483
6 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
read-tree.c
View File

@ -294,17 +294,20 @@ static int unpack_trees(merge_fn_t fn)
{
int indpos = 0;
unsigned len = object_list_length(trees);
struct tree_entry_list **posns =
xmalloc(len * sizeof(struct tree_entry_list *));
struct tree_entry_list **posns;
int i;
struct object_list *posn = trees;
merge_size = len;
for (i = 0; i < len; i++) {
posns[i] = ((struct tree *) posn->item)->entries;
posn = posn->next;
if (len) {
posns = xmalloc(len * sizeof(struct tree_entry_list *));
for (i = 0; i < len; i++) {
posns[i] = ((struct tree *) posn->item)->entries;
posn = posn->next;
}
if (unpack_trees_rec(posns, len, "", fn, &indpos))
return -1;
}
if (unpack_trees_rec(posns, len, "", fn, &indpos))
return -1;
if (trivial_merges_only && nontrivial_merge)
die("Merge requires file-level merging");