Skip to contentSkip to conversation

builtin/apply.c: Fix a "Using plain integer as NULL pointer" warning

PATCH New Ramsay Jones 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 builtin/apply.c: Fix a "Using plain integer as NULL pointer" warning

---

Hi Junio,

Could you please squash this into commit fe823c5 ("apply: plug the three-way merge logic in", 09-05-2012) in branch 'jc/apply-3way'.

Thanks!

ATB,
Ramsay Jones

 builtin/apply.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
builtin/apply.c +1 -1
index 507c73c..9cf3ce7 100644
@@ -3094,7 +3094,7 @@ static int three_way_merge(struct image *image,
 			   const unsigned char *theirs)
 {
 	mmfile_t base_file, our_file, their_file;
-	mmbuffer_t result = { 0 };
+	mmbuffer_t result = { NULL };
 	int status;
 
 	read_mmblob(&base_file, base);
Signature · 1 line
1.7.10