summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-02-06 12:05:51 -0500
committerShawn O. Pearce <spearce@spearce.org>2007-02-06 12:05:51 -0500
commite7d06a4b702463f13371eed92ba790b8c527dd76 (patch)
treed5c516671f4735b634135e86c28f8409ae9edfa8 /fast-import.c
parentc74ba3d344769b827443b8995853527c85d63567 (diff)
downloadgit-e7d06a4b702463f13371eed92ba790b8c527dd76.tar.gz
Remove unnecessary null pointer checks in fast-import.
There is no need to check for a NULL pointer before invoking free(), the runtime library automatically performs this check anyway and does nothing if a NULL pointer is supplied. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/fast-import.c b/fast-import.c
index c0cadc4279..4dcba416e0 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -969,10 +969,9 @@ static int store_object(
pack_size += s.total_out;
free(out);
- if (delta)
- free(delta);
+ free(delta);
if (last) {
- if (last->data && !last->no_free)
+ if (!last->no_free)
free(last->data);
last->data = dat;
last->offset = e->offset;
@@ -1521,9 +1520,7 @@ static void file_change_m(struct branch *b)
}
tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode);
-
- if (p_uq)
- free(p_uq);
+ free(p_uq);
}
static void file_change_d(struct branch *b)
@@ -1539,8 +1536,7 @@ static void file_change_d(struct branch *b)
p = p_uq;
}
tree_content_remove(&b->branch_tree, p);
- if (p_uq)
- free(p_uq);
+ free(p_uq);
}
static void cmd_from(struct branch *b)
@@ -1719,8 +1715,7 @@ static void cmd_new_commit(void)
sp += sprintf(sp, "%s\n\n", committer);
memcpy(sp, msg, msglen);
sp += msglen;
- if (author)
- free(author);
+ free(author);
free(committer);
free(msg);