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

Remove "pathlen" from "struct name_entry"

Browse Source 
Since we have the "tree_entry_len()" helper function these days, and
don't need to do a full strlen(), there's no point in saving the path
length - it's just redundant information.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds
2007-03-21 10:07:46 -07:00
committed by Junio C Hamano
parent 171dccd511
commit a8c40471ab
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
merge-tree.c
View File

@ -188,7 +188,7 @@ static void resolve(const char *base, struct name_entry *branch1, struct name_en
static int unresolved_directory(const char *base, struct name_entry n[3])
{
int baselen;
int baselen, pathlen;
char *newbase;
struct name_entry *p;
struct tree_desc t[3];
@ -205,10 +205,11 @@ static int unresolved_directory(const char *base, struct name_entry n[3])
if (!S_ISDIR(p->mode))
return 0;
baselen = strlen(base);
newbase = xmalloc(baselen + p->pathlen + 2);
pathlen = tree_entry_len(p->path, p->sha1);
newbase = xmalloc(baselen + pathlen + 2);
memcpy(newbase, base, baselen);
memcpy(newbase + baselen, p->path, p->pathlen);
memcpy(newbase + baselen + p->pathlen, "/", 2);
memcpy(newbase + baselen, p->path, pathlen);
memcpy(newbase + baselen + pathlen, "/", 2);
buf0 = fill_tree_descriptor(t+0, n[0].sha1);
buf1 = fill_tree_descriptor(t+1, n[1].sha1);