summaryrefslogtreecommitdiff
path: root/read-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-22 16:35:06 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-22 16:35:06 -0700
commitaba06682473e2d797011f966d66c93043e3ed57a (patch)
treec982679cb273515e4bfa54aa0dcb71ab505c9b48 /read-tree.c
parentcef661fc799a3a13ffdea4a3f69f1acd295de53d (diff)
downloadgit-aba06682473e2d797011f966d66c93043e3ed57a.tar.gz
Clean up and simplify read-tree a bit.
This is preparation for moving parts of it into "tree.c" to be used as a library function.
Diffstat (limited to 'read-tree.c')
-rw-r--r--read-tree.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/read-tree.c b/read-tree.c
index 8121e30671..345d576dcb 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -23,12 +23,9 @@ static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
return add_cache_entry(ce, 1);
}
-static int read_tree_recursive(void *buffer, const char *type,
- unsigned long size,
+static int read_tree_recursive(void *buffer, unsigned long size,
const char *base, int baselen)
{
- if (!buffer || strcmp(type, "tree"))
- return -1;
while (size) {
int len = strlen(buffer)+1;
unsigned char *sha1 = buffer + len;
@@ -50,12 +47,12 @@ static int read_tree_recursive(void *buffer, const char *type,
unsigned long eltsize;
eltbuf = read_sha1_file(sha1, elttype, &eltsize);
- if (!eltbuf)
+ if (!eltbuf || strcmp(elttype, "tree"))
return -1;
memcpy(newbase, base, baselen);
memcpy(newbase + baselen, path, pathlen);
newbase[baselen + pathlen] = '/';
- retval = read_tree_recursive(eltbuf, elttype, eltsize,
+ retval = read_tree_recursive(eltbuf, eltsize,
newbase,
baselen + pathlen + 1);
free(eltbuf);
@@ -76,7 +73,9 @@ static int read_tree(unsigned char *sha1, const char *base, int baselen)
unsigned long size;
buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, 0);
- return read_tree_recursive(buffer, "tree", size, base, baselen);
+ if (!buffer)
+ return -1;
+ return read_tree_recursive(buffer, size, base, baselen);
}
static char *lockfile_name;