@matheusbsbs / matheus-bagliano / commits / cf2ab916af

Fork 0

show_object(): push path_name() call further down

In particular, pushing the "path_name()" call _into_ the show() function would seem to allow - more clarity into who "owns" the name (ie now when we free the name in the show_object callback, it's because we generated it ourselves by calling path_name()) - not calling path_name() at all, either because we don't care about the name in the first place, or because we are actually happy walking the linked list of "struct name_path *" and the last component. Now, I didn't do that latter optimization, because it would require some more coding, but especially looking at "builtin-pack-objects.c", we really don't even want the whole pathname, we really would be better off with the list of path components. Why? We use that name for two things: - add_preferred_base_object(), which actually _wants_ to traverse the path, and now does it by looking for '/' characters! - for 'name_hash()', which only cares about the last 16 characters of a name, so again, generating the full name seems to be just unnecessary work. Anyway, so I didn't look any closer at those things, but it did convince me that the "show_object()" calling convention was crazy, and we're actually better off doing _less_ in list-objects.c, and giving people access to the internal data structures so that they can decide whether they want to generate a path-name or not. This patch does that, and then for people who did use the name (even if they might do something more clever in the future), it just does the straightforward "name = path_name(path, component); .. free(name);" thing. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Linus Torvalds committed Apr 10, 2009 at 18:15 UTC cf2ab916afa4231f7e9db31796e7c0f712ff6ad1

7 files changed +20 -14

builtin-pack-objects.c

+3 -1

@@ -1856,8 +1856,10 @@ static void show_commit(struct commit *commit)

1856 commit->object.flags |= OBJECT_ADDED;

1857 }

1858

1859 -static void show_object(struct object *obj, const char *name)

1859 +static void show_object(struct object *obj, const struct name_path *path, const char *last)

1860 {

1861 + char *name = path_name(path, last);

1862 +

1863 add_preferred_base_object(name);

1864 add_object_entry(obj->sha1, obj->type, name, 0);

1865 obj->flags |= OBJECT_ADDED;

builtin-rev-list.c

+5 -3

@@ -169,20 +169,21 @@ static void finish_commit(struct commit *commit)

169 commit->buffer = NULL;

170 }

171

172 -static void finish_object(struct object *obj, const char *name)

172 +static void finish_object(struct object *obj, const struct name_path *path, const char *name)

173 {

174 if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1))

175 die("missing blob object '%s'", sha1_to_hex(obj->sha1));

176 }

177

178 -static void show_object(struct object *obj, const char *name)

178 +static void show_object(struct object *obj, const struct name_path *path, const char *component)

179 {

180 + char *name = path_name(path, component);

181 /* An object with name "foo\n0000000..." can be used to

182 * confuse downstream "git pack-objects" very badly.

183 */

184 const char *ep = strchr(name, '\n');

185

185 - finish_object(obj, name);

186 + finish_object(obj, path, name);

187 if (ep) {

188 printf("%s %.*s\n", sha1_to_hex(obj->sha1),

189 (int) (ep - name),

@@ -190,6 +191,7 @@ static void show_object(struct object *obj, const char *name)

191 }

192 else

193 printf("%s %s\n", sha1_to_hex(obj->sha1), name);

194 + free(name);

195 }

196

197 static void show_edge(struct commit *commit)

list-objects.c

+5 -5

@@ -23,7 +23,7 @@ static void process_blob(struct rev_info *revs,

23 if (obj->flags & (UNINTERESTING | SEEN))

24 return;

25 obj->flags |= SEEN;

26 - show(obj, path_name(path, name));

26 + show(obj, path, name);

27 }

29 /*

@@ -77,7 +77,7 @@ static void process_tree(struct rev_info *revs,

77 if (parse_tree(tree) < 0)

78 die("bad tree object %s", sha1_to_hex(obj->sha1));

79 obj->flags |= SEEN;

80 - show(obj, path_name(path, name));

80 + show(obj, path, name);

81 me.up = path;

82 me.elem = name;

83 me.elem_len = strlen(name);

@@ -140,8 +140,8 @@ static void add_pending_tree(struct rev_info *revs, struct tree *tree)

140 }

141

142 void traverse_commit_list(struct rev_info *revs,

143 - void (*show_commit)(struct commit *),

144 - void (*show_object)(struct object *, const char *))

143 + show_commit_fn show_commit,

144 + show_object_fn show_object)

145 {

146 int i;

147 struct commit *commit;

@@ -158,7 +158,7 @@ void traverse_commit_list(struct rev_info *revs,

158 continue;

159 if (obj->type == OBJ_TAG) {

160 obj->flags |= SEEN;

161 - show_object(obj, name);

161 + show_object(obj, NULL, name);

162 continue;

163 }

164 if (obj->type == OBJ_TREE) {

list-objects.h

+1 -1

@@ -2,7 +2,7 @@

2 #define LIST_OBJECTS_H

4 typedef void (*show_commit_fn)(struct commit *);

5 -typedef void (*show_object_fn)(struct object *, const char *);

5 +typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *);

6 typedef void (*show_edge_fn)(struct commit *);

8 void traverse_commit_list(struct rev_info *revs, show_commit_fn, show_object_fn);

revision.c

+2 -2

@@ -14,9 +14,9 @@

15 volatile show_early_output_fn_t show_early_output;

17 -char *path_name(struct name_path *path, const char *name)

17 +char *path_name(const struct name_path *path, const char *name)

18 {

19 - struct name_path *p;

19 + const struct name_path *p;

20 char *n, *m;

21 int nlen = strlen(name);

22 int len = nlen + 1;

revision.h

+1 -1

@@ -141,7 +141,7 @@ struct name_path {

141 const char *elem;

142 };

143

144 -char *path_name(struct name_path *path, const char *name);

144 +char *path_name(const struct name_path *path, const char *name);

145

146 extern void add_object(struct object *obj,

147 struct object_array *p,

upload-pack.c

+3 -1

@@ -78,11 +78,12 @@ static void show_commit(struct commit *commit)

78 commit->buffer = NULL;

79 }

81 -static void show_object(struct object *obj, const char *name)

81 +static void show_object(struct object *obj, const struct name_path *path, const char *component)

82 {

83 /* An object with name "foo\n0000000..." can be used to

84 * confuse downstream git-pack-objects very badly.

85 */

86 + const char *name = path_name(path, component);

87 const char *ep = strchr(name, '\n');

88 if (ep) {

89 fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),

@@ -92,6 +93,7 @@ static void show_object(struct object *obj, const char *name)

93 else

94 fprintf(pack_pipe, "%s %s\n",

95 sha1_to_hex(obj->sha1), name);

96 + free((char *)name);

97 }

99 static void show_edge(struct commit *commit)