зеркало из https://github.com/microsoft/git.git
fast-import: Fix an gcc -Wuninitialized warning
Commitcbfd5e1c
("drop some obsolete "x = x" compiler warning hacks", 21-03-2013) removed a gcc hack that suppressed an "might be used uninitialized" warning issued by older versions of gcc. However, commit3aa99df8
('fast-import: clarify "inline" logic in file_change_m', 21-03-2013) addresses an (almost) identical issue (with very similar code), but includes additional code in it's resolution. The solution used by this commit, unlike that used by commitcbfd5e1c
, also suppresses the -Wuninitialized warning on older versions of gcc. In order to suppress the warning (against the 'oe' symbol) in the note_change_n() function, we adopt the same solution used by commit3aa99df8
. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
5e950c2199
Коммит
0a34594c83
|
@ -2465,6 +2465,7 @@ static void note_change_n(struct branch *b, unsigned char *old_fanout)
|
||||||
hashcpy(sha1, oe->idx.sha1);
|
hashcpy(sha1, oe->idx.sha1);
|
||||||
} else if (!prefixcmp(p, "inline ")) {
|
} else if (!prefixcmp(p, "inline ")) {
|
||||||
inline_data = 1;
|
inline_data = 1;
|
||||||
|
oe = NULL; /* not used with inline_data, but makes gcc happy */
|
||||||
p += strlen("inline"); /* advance to space */
|
p += strlen("inline"); /* advance to space */
|
||||||
} else {
|
} else {
|
||||||
if (get_sha1_hex(p, sha1))
|
if (get_sha1_hex(p, sha1))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче