@matheusbsbs / matheus-bagliano / commits / 83838d5c1b

cast variable in call to free() in builtin/diff.c and submodule.c

Both of these free() calls are freeing a "const unsigned char (*)[20]" type while free() expects a "void *". This results in the following warning under clang 2.9: builtin/diff.c:185:7: warning: passing 'const unsigned char (*)[20]' to parameter of type 'void *' discards qualifiers free(parent); ^~~~~~ submodule.c:394:7: warning: passing 'const unsigned char (*)[20]' to parameter of type 'void *' discards qualifiers free(parents); ^~~~~~~ This free()-ing without a cast was added by Jim Meyering to builtin/diff.c in v1.7.6-rc3~4 and later by Fredrik Gustafsson in submodule.c in v1.7.7-rc1~25^2. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Nov 6, 2011 at 13:06 UTC 83838d5c1b8ca2efee52184136776c3cf7d5df2f

2 files changed +2 -2

builtin/diff.c

+1 -1

@@ -182,7 +182,7 @@ static int builtin_diff_combined(struct rev_info *revs,

182 hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);

183 diff_tree_combined(parent[0], parent + 1, ents - 1,

184 revs->dense_combined_merges, revs);

185 - free(parent);

185 + free((void *)parent);

186 return 0;

187 }

188

submodule.c

+1 -1

@@ -385,7 +385,7 @@ static void commit_need_pushing(struct commit *commit, struct commit_list *paren

385 rev.diffopt.format_callback_data = needs_pushing;

386 diff_tree_combined(commit->object.sha1, parents, n, 1, &rev);

387

388 - free(parents);

388 + free((void *)parents);

389 }

390

391 int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name)