undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revision.c: update show_object_with_name() without using malloc()

Browse Source 
Allocating and then immediately freeing temporary memory a million times
when listing a million objects is distasteful.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-08-17 14:30:35 -07:00
parent 91f175165a
commit beba25abbc
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
revision.c
View File

@ -40,23 +40,45 @@ char *path_name(const struct name_path *path, const char *name)
return n; return n;
} }
static int show_path_component_truncated(FILE *out, const char *name, int len)
{
int cnt;
for (cnt = 0; cnt < len; cnt++) {
int ch = name[cnt];
if (!ch || ch == '\n')
return -1;
fputc(ch, out);
}
return len;
}
static int show_path_truncated(FILE *out, const struct name_path *path)
{
int emitted, ours;
if (!path)
return 0;
emitted = show_path_truncated(out, path->up);
if (emitted < 0)
return emitted;
if (emitted)
fputc('/', out);
ours = show_path_component_truncated(out, path->elem, path->elem_len);
if (ours < 0)
return ours;
return ours || emitted;
}
void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component) void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
{ {
char *name = path_name(path, component); struct name_path leaf;
const char *ep = strchr(name, '\n'); leaf.up = (struct name_path *)path;
leaf.elem = component;
leaf.elem_len = strlen(component);
/* fprintf(out, "%s ", sha1_to_hex(obj->sha1));
* An object with name "foo\n0000000..." can be used to show_path_truncated(out, &leaf);
* confuse downstream "git pack-objects" very badly. fputc('\n', out);
*/
if (ep) {
fprintf(out, "%s %.*s\n", sha1_to_hex(obj->sha1),
(int) (ep - name),
name);
}
else
fprintf(out, "%s %s\n", sha1_to_hex(obj->sha1), name);
free(name);
} }
void add_object(struct object *obj, void add_object(struct object *obj,