[PATCH] Introduce diff_free_filepair() funcion.

Junio C Hamano · Linus Torvalds · commit 226406f69301 · 2005-05-29T11:17:43.000-07:00
This introduces a new function to free a common data structure,
and plugs some leaks.

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git a/diff.c b/diff.c
@@ -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;
diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
@@ -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;
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
@@ -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;
diff --git a/diffcore-rename.c b/diffcore-rename.c
@@ -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);
 
diff --git a/diffcore.h b/diffcore.h
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ void diffcore_pathspec(const char **pathspec)`
`59`	`59`	`matches_pathspec(p->two->path, spec, speccnt))`
`60`	`60`	`diff_q(&outq, p);`
`61`	`61`	`else`
`62`		`- free(p);`
	`62`	`+ diff_free_filepair(p);`
`63`	`63`	`}`
`64`	`64`	`free(q->queue);`
`65`	`65`	`*q = outq;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void diffcore_pickaxe(const char *needle)`
`49`	`49`	`contains(p->two, needle, len))`
`50`	`50`	`diff_q(&outq, p);`
`51`	`51`	`if (onum == outq.nr)`
`52`		`- free(p);`
	`52`	`+ diff_free_filepair(p);`
`53`	`53`	`}`
`54`	`54`	`free(q->queue);`
`55`	`55`	`*q = outq;`
Original file line number	Diff line number	Diff line change
`@@ -361,11 +361,8 @@ void diffcore_rename(int detect_rename, int minimum_score)`
`361`	`361`	`else`
`362`	`362`	`pair_to_free = p;`
`363`	`363`	`}`
`364`		`- if (pair_to_free) {`
`365`		`- diff_free_filespec_data(pair_to_free->one);`
`366`		`- diff_free_filespec_data(pair_to_free->two);`
`367`		`- free(pair_to_free);`
`368`		`- }`
	`364`	`+ if (pair_to_free)`
	`365`	`+ diff_free_filepair(pair_to_free);`
`369`	`366`	`}`
`370`	`367`	`diff_debug_queue("done copying original", &outq);`
`371`	`368`