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

Use xmalloc instead of malloc

Browse Source 
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jonas Fonseca
2006-09-01 00:32:39 +02:00
committed by Junio C Hamano
parent ef1186228d
commit 2d7320d0b0
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-fmt-merge-msg.c
View File

@ -140,14 +140,14 @@ static int handle_line(char *line)
if (!strcmp(".", src) || !strcmp(src, origin)) {
int len = strlen(origin);
if (origin[0] == '\'' && origin[len - 1] == '\'') {
char *new_origin = malloc(len - 1);
char *new_origin = xmalloc(len - 1);
memcpy(new_origin, origin + 1, len - 2);
new_origin[len - 1] = 0;
origin = new_origin;
} else
origin = strdup(origin);
} else {
char *new_origin = malloc(strlen(origin) + strlen(src) + 5);
char *new_origin = xmalloc(strlen(origin) + strlen(src) + 5);
sprintf(new_origin, "%s of %s", origin, src);
origin = new_origin;
}
@ -214,7 +214,7 @@ static void shortlog(const char *name, unsigned char *sha1,
if (eol) {
int len = eol - bol;
oneline = malloc(len + 1);
oneline = xmalloc(len + 1);
memcpy(oneline, bol, len);
oneline[len] = 0;
} else