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

[PATCH] show-diff.c: clean up private buffer use.

Browse Source 
This patch fixes sq_expand() and show_differences() not to use and
hold onto its privately allocated buffer, which was a misguided
attempt to reduce calls to malloc but made later changes harder.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-04-18 15:07:24 -07:00
committed by Linus Torvalds
parent 00829b5def
commit c157d37674
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
show-diff.c
View File

@ -23,7 +23,6 @@ static char *diff_cmd = "diff -L '%s' -u -N - '%s'";
static char *sq_expand(char *src) static char *sq_expand(char *src)
{ {
static char *buf = NULL; static char *buf = NULL;
static int buf_size = -1;
int cnt, c; int cnt, c;
char *cp; char *cp;
@ -32,12 +31,8 @@ static char *sq_expand(char *src)
if (*cp == '\'') if (*cp == '\'')
cnt += 3; cnt += 3;
if (buf_size < cnt) { if (! (buf = malloc(cnt)))
free(buf); return buf;
buf_size = cnt;
buf = malloc(cnt);
}
cp = buf; cp = buf;
while ((c = *src++)) { while ((c = *src++)) {
if (c != '\'') if (c != '\'')
@ -55,22 +50,17 @@ static void show_differences(char *name, void *old_contents,
unsigned long long old_size) unsigned long long old_size)
{ {
FILE *f; FILE *f;
static char *cmd = NULL;
static int cmd_size = -1;
char *name_sq = sq_expand(name); char *name_sq = sq_expand(name);
int cmd_required_length = strlen(name_sq) * 2 + strlen(diff_cmd); int cmd_size = strlen(name_sq) * 2 + strlen(diff_cmd);
char *cmd = malloc(cmd_size);
if (cmd_size < cmd_required_length) {
free(cmd);
cmd_size = cmd_required_length;
cmd = malloc(cmd_required_length);
}
snprintf(cmd, cmd_size, diff_cmd, name_sq, name_sq); snprintf(cmd, cmd_size, diff_cmd, name_sq, name_sq);
f = popen(cmd, "w"); f = popen(cmd, "w");
if (old_size) if (old_size)
fwrite(old_contents, old_size, 1, f); fwrite(old_contents, old_size, 1, f);
pclose(f); pclose(f);
free(name_sq);
free(cmd);
} }
static void show_diff_empty(struct cache_entry *ce) static void show_diff_empty(struct cache_entry *ce)