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

builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarily

Browse Source 
Make insert_one_record() use string_list_append(), instead of duplicating
its code. Because of this, do not free the "util" member when clearing the
"onelines" string lists: with the new code path it is not initialized to
any value (was being initialized to NULL previously).

Also, avoid unnecessary strdup() calls when inserting names in log->list.
This list always has "strdup_strings" activated, hence strdup'ing namebuf is
unnecessary. This change also removes a latent memory leak in the old code.

NB: The duplicated code mentioned above predated the appearance of
string_list_append().

Signed-off-by: Adeodato Simó <dato@net.com.org.es>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adeodato Simó 2008-12-30 22:01:44 +01:00 committed by Junio C Hamano
parent 8104ebfe82
commit fe73fc1abe
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin-shortlog.c
View File

@ -36,7 +36,6 @@ static void insert_one_record(struct shortlog *log,
const char *dot3 = log->common_repo_prefix;
char *buffer, *p;
struct string_list_item *item;
struct string_list *onelines;
char namebuf[1024];
size_t len;
const char *eol;
@ -68,12 +67,9 @@ static void insert_one_record(struct shortlog *log,
snprintf(namebuf + len, room, " %.*s", maillen, boemail);
}
buffer = xstrdup(namebuf);
item = string_list_insert(buffer, &log->list);
item = string_list_insert(namebuf, &log->list);
if (item->util == NULL)
item->util = xcalloc(1, sizeof(struct string_list));
else
free(buffer);
/* Skip any leading whitespace, including any blank lines. */
while (*oneline && isspace(*oneline))
@ -104,16 +100,7 @@ static void insert_one_record(struct shortlog *log,
}
}
onelines = item->util;
if (onelines->nr >= onelines->alloc) {
onelines->alloc = alloc_nr(onelines->nr);
onelines->items = xrealloc(onelines->items,
onelines->alloc
* sizeof(struct string_list_item));
}
onelines->items[onelines->nr].util = NULL;
onelines->items[onelines->nr++].string = buffer;
string_list_append(buffer, item->util);
}
static void read_from_stdin(struct shortlog *log)
@ -323,7 +310,7 @@ void shortlog_output(struct shortlog *log)
}
onelines->strdup_strings = 1;
string_list_clear(onelines, 1);
string_list_clear(onelines, 0);
free(onelines);
log->list.items[i].util = NULL;
}