summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2009-05-01 09:06:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-01 22:17:31 (GMT)
commit4b25d091ba53c758fae0096b8c0662371857b9d9 (patch)
treefc5bb9b0e2ffad8182f26a7efafae8571e613b48 /combine-diff.c
parent75b44066f3ed7cde238cdea1f0bf9e2f1744c820 (diff)
downloadgit-4b25d091ba53c758fae0096b8c0662371857b9d9.zip
git-4b25d091ba53c758fae0096b8c0662371857b9d9.tar.gz
git-4b25d091ba53c758fae0096b8c0662371857b9d9.tar.bz2
Fix a bunch of pointer declarations (codestyle)
Essentially; s/type* /type */ as per the coding guidelines. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c
index d210656..60d0367 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -24,7 +24,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
path = q->queue[i]->two->path;
len = strlen(path);
p = xmalloc(combine_diff_path_size(num_parent, len));
- p->path = (char*) &(p->parent[num_parent]);
+ p->path = (char *) &(p->parent[num_parent]);
memcpy(p->path, path, len);
p->path[len] = 0;
p->len = len;
@@ -1063,7 +1063,7 @@ void diff_tree_combined_merge(const unsigned char *sha1,
for (parents = commit->parents, num_parent = 0;
parents;
parents = parents->next, num_parent++)
- hashcpy((unsigned char*)(parent + num_parent),
+ hashcpy((unsigned char *)(parent + num_parent),
parents->item->object.sha1);
diff_tree_combined(sha1, parent, num_parent, dense, rev);
}