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>
maint
parent
473f4c96e3
commit
83838d5c1b
|
|
@ -182,7 +182,7 @@ static int builtin_diff_combined(struct rev_info *revs,
|
|||
hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
|
||||
diff_tree_combined(parent[0], parent + 1, ents - 1,
|
||||
revs->dense_combined_merges, revs);
|
||||
free(parent);
|
||||
free((void *)parent);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -385,7 +385,7 @@ static void commit_need_pushing(struct commit *commit, struct commit_list *paren
|
|||
rev.diffopt.format_callback_data = needs_pushing;
|
||||
diff_tree_combined(commit->object.sha1, parents, n, 1, &rev);
|
||||
|
||||
free(parents);
|
||||
free((void *)parents);
|
||||
}
|
||||
|
||||
int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name)
|
||||
|
|
|
|||
Loading…
Reference in New Issue