X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree-diff.c;h=7bb6109111c0e8d4de11597fd64acb2a8b346879;hb=53069686601d156dea3787a100ffc4e35c78040f;hp=d978428910a33ee9443343beeb1574e79d2a71ad;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git diff --git a/tree-diff.c b/tree-diff.c index d9784289..7bb61091 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -9,34 +9,6 @@ static int nr_paths = 0; static const char **paths = NULL; static int *pathlens = NULL; -void update_tree_entry(struct tree_desc *desc) -{ - void *buf = desc->buf; - unsigned long size = desc->size; - int len = strlen(buf) + 1 + 20; - - if (size < len) - die("corrupt tree file"); - desc->buf = buf + len; - desc->size = size - len; -} - -const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep) -{ - void *tree = desc->buf; - unsigned long size = desc->size; - int len = strlen(tree)+1; - const unsigned char *sha1 = tree + len; - const char *path = strchr(tree, ' '); - unsigned int mode; - - if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1) - die("corrupt tree file"); - *pathp = path+1; - *modep = DIFF_FILE_CANON_MODE(mode); - return sha1; -} - static char *malloc_base(const char *base, const char *path, int pathlen) { int baselen = strlen(base);