From: Paul Eggert Date: Tue, 5 Apr 2011 20:08:58 +0000 (-0700) Subject: * term.c (vfatal, maybe_fatal): Mark as printf-like functions. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~8 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13841b558c0d4515387b93bcb7fe0fadf0e68579;p=emacs.git * term.c (vfatal, maybe_fatal): Mark as printf-like functions. --- diff --git a/src/ChangeLog b/src/ChangeLog index c46f6f37cde..6bb7a6ff143 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,8 @@ Fix more problems found by GCC 4.6.0's static checks. + * term.c (vfatal, maybe_fatal): Mark as printf-like functions. + * sound.c (sound_warning): Don't crash if arg contains a printf format. * image.c (tiff_error_handler, tiff_warning_handler): Mark as diff --git a/src/term.c b/src/term.c index fc07c2b8d06..d4e5faf01c8 100644 --- a/src/term.c +++ b/src/term.c @@ -85,8 +85,10 @@ static void set_tty_hooks (struct terminal *terminal); static void dissociate_if_controlling_tty (int fd); static void delete_tty (struct terminal *); static void maybe_fatal (int must_succeed, struct terminal *terminal, - const char *str1, const char *str2, ...) NO_RETURN; -static void vfatal (const char *str, va_list ap) NO_RETURN; + const char *str1, const char *str2, ...) + NO_RETURN ATTRIBUTE_FORMAT_PRINTF (3, 5) ATTRIBUTE_FORMAT_PRINTF (4, 5); +static void vfatal (const char *str, va_list ap) + NO_RETURN ATTRIBUTE_FORMAT_PRINTF (1, 0); #define OUTPUT(tty, a) \