Use NONRETURNING and PRINTFFORMAT instead of NONRETURNPRINTFFORMAT attribute

diff --git a/ChangeLog b/ChangeLog
index 78edaf989519b0a41d75ad95bbb1dd73eed5195d..90e093aff30f0e55adf6bd92324e2cdccb5cdd27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-02  Guillem Jover  <guillem@debian.org>
+
+       * lib/dpkg.h (NONRETURNPRINTFFORMAT): Remove macro.
+       (ohshit): Use NONRETURNING and PRINTFFORMAT instead of
+       NONRETURNPRINTFFORMAT.
+       (ohshite): Likewise.
+       (badusage): Likewise.
+       * utils/start-stop-daemon.c (NONRETURNPRINTFFORMAT): Remove macro.
+       (fatal): Use NONRETURNING and PRINTFFORMAT instead of
+       NONRETURNPRINTFFORMAT.
+
 2008-01-01  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-buildpackage.pl: Use Dpkg::Compression. Use $comp_regex

diff --git a/lib/dpkg.h b/lib/dpkg.h
index ff3ac9acc4d69ee1ac0bf56e267724cc30c3a5e2..d932f1aa5193fa1c5dde3abf10ec418395287b65 100644 (file)
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -159,13 +159,11 @@ extern const char printforhelp[];
 # define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc)))
 # define NONRETURNING __attribute__((noreturn))
 # define UNUSED __attribute__((unused))
-# define NONRETURNPRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc),noreturn))
 #else
 # define CONSTANT
 # define PRINTFFORMAT(si, tc)
 # define NONRETURNING
 # define UNUSED
-# define NONRETURNPRINTFFORMAT(si, tc)
 #endif
 
 /*** from startup.c ***/
@@ -211,11 +209,11 @@ void do_internerr(const char *string, int line, const char *file) NONRETURNING;
 #define internerr(s) do_internerr(s,__LINE__,__FILE__)
 
 struct varbuf;
-void ohshit(const char *fmt, ...) NONRETURNPRINTFFORMAT(1,2);
+void ohshit(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
 void ohshitv(const char *fmt, va_list al) NONRETURNING;
-void ohshite(const char *fmt, ...) NONRETURNPRINTFFORMAT(1,2);
+void ohshite(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
 void ohshitvb(struct varbuf*) NONRETURNING;
-void badusage(const char *fmt, ...) NONRETURNPRINTFFORMAT(1,2);
+void badusage(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
 void werr(const char *what) NONRETURNING;
 void warningf(const char *fmt, ...);
 

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 30bae5703d9bab778c2d8a705875c586a6cdb585..e4bbc4145c0b57a1a88888e30e8976390ba88c89 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -106,13 +106,11 @@
 # define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc)))
 # define NONRETURNING __attribute__((noreturn))
 # define UNUSED __attribute__((unused))
-# define NONRETURNPRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc),noreturn))
 #else
 # define CONSTANT
 # define PRINTFFORMAT(si, tc)
 # define NONRETURNING
 # define UNUSED
-# define NONRETURNPRINTFFORMAT(si, tc)
 #endif
 
 static int testmode = 0;
@@ -180,7 +178,7 @@ static int pid_is_exec(pid_t pid, const struct stat *esb);
 
 #ifdef __GNUC__
 static void fatal(const char *format, ...)
-       NONRETURNPRINTFFORMAT(1, 2);
+       NONRETURNING PRINTFFORMAT(1, 2);
 static void badusage(const char *msg)
        NONRETURNING;
 #else