TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Restore format(printf) attribute for powerup_basic

Browse source 
Kreeblah reports that clang now warns for powerup.cpp due to a missing
__attribute_format_printf.  This was incorrectly dropped in
ffb653c0b8.  gcc did not warn, but clang
now warns.  Add back the attribute.

Fixes: ffb653c0b8 ("Pass control_info & to various functions")
Reported-by: Kreeblah <https://github.com/dxx-rebirth/dxx-rebirth/pull/547>
This commit is contained in:
Kp 2020-10-27 04:27:55 +00:00
parent 31bb275b0f
commit a028ea14ae
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/main/powerup.h
View file

@ -162,6 +162,5 @@ extern void do_megawow_powerup(int quantity);
void powerup_basic_str(int redadd, int greenadd, int blueadd, int score, const char *str) __attribute_nonnull();
}
#endif
#define powerup_basic(A1,A2,A3,A4,F,...) dxx_call_printf_checked(powerup_basic,powerup_basic_str,(A1,A2,A3,A4),(F),##__VA_ARGS__)
#endif

2
similar/main/powerup.cpp
View file

@ -140,6 +140,8 @@ static void _powerup_basic_nonhud(int redadd, int greenadd, int blueadd, int sco
add_points_to_score(ConsoleObject->ctype.player_info, score);
}
#define powerup_basic(A1,A2,A3,A4,F,...) dxx_call_printf_checked(powerup_basic,powerup_basic_str,(A1,A2,A3,A4),(F),##__VA_ARGS__)
__attribute_format_printf(5, 6)
void (powerup_basic)(int redadd, int greenadd, int blueadd, int score, const char *format, ...)
{
va_list args;