mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-22 03:56:33 +02:00
Code

[PATCH] Introduce diff_free_filepair() funcion. 

This introduces a new function to free a common data structure,
and plugs some leaks.

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-05-27 15:50:30 -07:00 committed by Linus Torvalds
parent a00d7d106a
commit 226406f693
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
diff.c
View File

@ -521,6 +521,13 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
return dp;
}
void diff_free_filepair(struct diff_filepair *p)
{
diff_free_filespec_data(p->one);
diff_free_filespec_data(p->two);
free(p);
}
static void diff_flush_raw(struct diff_filepair *p,
int line_termination,
int inter_name_termination)
@ -817,12 +824,8 @@ void diff_flush(int diff_output_style, int resolve_rename_copy)
break;
}
}
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
diff_free_filespec_data(p->one);
diff_free_filespec_data(p->two);
free(p);
}
for (i = 0; i < q->nr; i++)
diff_free_filepair(q->queue[i]);
free(q->queue);
q->queue = NULL;
q->nr = q->alloc = 0;

2
diffcore-pathspec.c
View File

@ -59,7 +59,7 @@ void diffcore_pathspec(const char **pathspec)
matches_pathspec(p->two->path, spec, speccnt))
diff_q(&outq, p);
else
free(p);
diff_free_filepair(p);
}
free(q->queue);
*q = outq;

2
diffcore-pickaxe.c
View File

@ -49,7 +49,7 @@ void diffcore_pickaxe(const char *needle)
contains(p->two, needle, len))
diff_q(&outq, p);
if (onum == outq.nr)
free(p);
diff_free_filepair(p);
}
free(q->queue);
*q = outq;

7
diffcore-rename.c
View File

@ -361,11 +361,8 @@ void diffcore_rename(int detect_rename, int minimum_score)
else
pair_to_free = p;
}
if (pair_to_free) {
diff_free_filespec_data(pair_to_free->one);
diff_free_filespec_data(pair_to_free->two);
free(pair_to_free);
}
if (pair_to_free)
diff_free_filepair(pair_to_free);
}
diff_debug_queue("done copying original", &outq);

2
diffcore.h
View File

@ -54,6 +54,8 @@ struct diff_filepair {
(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
extern void diff_free_filepair(struct diff_filepair *);
extern int diff_unmodified_pair(struct diff_filepair *);
struct diff_queue_struct {