undef/git-commit-vandalism
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-grep.c
View File

@ -378,7 +378,7 @@ static int grep_tree(struct grep_opt *opt, const char **paths,
* decide if we want to descend into "abc" * decide if we want to descend into "abc"
* directory. * directory.
*/ */
strcpy(path_buf + len + entry.pathlen, "/"); strcpy(path_buf + len + tree_entry_len(entry.path, entry.sha1), "/");
if (!pathspec_matches(paths, down)) if (!pathspec_matches(paths, down))
; ;

2
builtin-pack-objects.c
View File

@ -854,7 +854,7 @@ static void add_pbase_object(struct tree_desc *tree,
unsigned long size; unsigned long size;
enum object_type type; enum object_type type;
if (entry.pathlen != cmplen || if (tree_entry_len(entry.path, entry.sha1) != cmplen ||
memcmp(entry.path, name, cmplen) || memcmp(entry.path, name, cmplen) ||
!has_sha1_file(entry.sha1) || !has_sha1_file(entry.sha1) ||
(type = sha1_object_info(entry.sha1, &size)) < 0) (type = sha1_object_info(entry.sha1, &size)) < 0)

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]) static int unresolved_directory(const char *base, struct name_entry n[3])
{ {
int baselen; int baselen, pathlen;
char *newbase; char *newbase;
struct name_entry *p; struct name_entry *p;
struct tree_desc t[3]; 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)) if (!S_ISDIR(p->mode))
return 0; return 0;
baselen = strlen(base); 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, base, baselen);
memcpy(newbase + baselen, p->path, p->pathlen); memcpy(newbase + baselen, p->path, pathlen);
memcpy(newbase + baselen + p->pathlen, "/", 2); memcpy(newbase + baselen + pathlen, "/", 2);
buf0 = fill_tree_descriptor(t+0, n[0].sha1); buf0 = fill_tree_descriptor(t+0, n[0].sha1);
buf1 = fill_tree_descriptor(t+1, n[1].sha1); buf1 = fill_tree_descriptor(t+1, n[1].sha1);

6
tree-walk.c
View File

@ -20,8 +20,8 @@ void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1)
static int entry_compare(struct name_entry *a, struct name_entry *b) static int entry_compare(struct name_entry *a, struct name_entry *b)
{ {
return base_name_compare( return base_name_compare(
a->path, a->pathlen, a->mode, a->path, tree_entry_len(a->path, a->sha1), a->mode,
b->path, b->pathlen, b->mode); b->path, tree_entry_len(b->path, b->sha1), b->mode);
} }
static void entry_clear(struct name_entry *a) static void entry_clear(struct name_entry *a)
@ -32,7 +32,6 @@ static void entry_clear(struct name_entry *a)
static void entry_extract(struct tree_desc *t, struct name_entry *a) static void entry_extract(struct tree_desc *t, struct name_entry *a)
{ {
a->sha1 = tree_entry_extract(t, &a->path, &a->mode); a->sha1 = tree_entry_extract(t, &a->path, &a->mode);
a->pathlen = tree_entry_len(a->path, a->sha1);
} }
void update_tree_entry(struct tree_desc *desc) void update_tree_entry(struct tree_desc *desc)
@ -93,7 +92,6 @@ int tree_entry(struct tree_desc *desc, struct name_entry *entry)
entry->path = path; entry->path = path;
len = strlen(path); len = strlen(path);
entry->pathlen = len;
path += len + 1; path += len + 1;
entry->sha1 = (const unsigned char *) path; entry->sha1 = (const unsigned char *) path;

1
tree-walk.h
View File

@ -10,7 +10,6 @@ struct name_entry {
const unsigned char *sha1; const unsigned char *sha1;
const char *path; const char *path;
unsigned int mode; unsigned int mode;
int pathlen;
}; };
static inline int tree_entry_len(const char *name, const unsigned char *sha1) static inline int tree_entry_len(const char *name, const unsigned char *sha1)

9
tree.c
View File

@ -101,14 +101,15 @@ int read_tree_recursive(struct tree *tree,
if (S_ISDIR(entry.mode)) { if (S_ISDIR(entry.mode)) {
int retval; int retval;
char *newbase; char *newbase;
unsigned int pathlen = tree_entry_len(entry.path, entry.sha1);
newbase = xmalloc(baselen + 1 + entry.pathlen); newbase = xmalloc(baselen + 1 + pathlen);
memcpy(newbase, base, baselen); memcpy(newbase, base, baselen);
memcpy(newbase + baselen, entry.path, entry.pathlen); memcpy(newbase + baselen, entry.path, pathlen);
newbase[baselen + entry.pathlen] = '/'; newbase[baselen + pathlen] = '/';
retval = read_tree_recursive(lookup_tree(entry.sha1), retval = read_tree_recursive(lookup_tree(entry.sha1),
newbase, newbase,
baselen + entry.pathlen + 1, baselen + pathlen + 1,
stage, match, fn); stage, match, fn);
free(newbase); free(newbase);
if (retval) if (retval)