coccinelle: make use of the "expression" FREE_AND_NULL() rule

avar · gitster · commit e140f7afddcd · 2017-06-16T12:44:07.000-07:00
A follow-up to the existing "expression" rule added in an earlier
change. This manually excludes a few occurrences, mostly things that
resulted in many FREE_AND_NULL() on one line, that'll be manually
fixed in a subsequent change.

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/blame.c b/blame.c
@@ -314,8 +314,7 @@ static void fill_origin_blob(struct diff_options *opt,
 static void drop_origin_blob(struct blame_origin *o)
 {
 	if (o->file.ptr) {
-		free(o->file.ptr);
-		o->file.ptr = NULL;
+		FREE_AND_NULL(o->file.ptr);
 	}
 }
 
diff --git a/ll-merge.c b/ll-merge.c
@@ -209,8 +209,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
 	result->size = st.st_size;
 	result->ptr = xmallocz(result->size);
 	if (read_in_full(fd, result->ptr, result->size) != result->size) {
-		free(result->ptr);
-		result->ptr = NULL;
+		FREE_AND_NULL(result->ptr);
 		result->size = 0;
 	}
  close_bad:

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,7 @@ static void fill_origin_blob(struct diff_options *opt,`
`314`	`314`	`static void drop_origin_blob(struct blame_origin *o)`
`315`	`315`	`{`
`316`	`316`	`if (o->file.ptr) {`
`317`		`- free(o->file.ptr);`
`318`		`- o->file.ptr = NULL;`
	`317`	`+ FREE_AND_NULL(o->file.ptr);`
`319`	`318`	`}`
`320`	`319`	`}`
`321`	`320`