Replace the rest of the uses of __attribute__ that need to be portable (Issue #5349)

3 files changed, 9 insertions, 37 deletions

diff --git a/backend/dnssd.c b/backend/dnssd.c
index 7074f4294..fde79ecb9 100644
--- a/backend/dnssd.c
+++ b/backend/dnssd.c
@@ -82,23 +82,8 @@ static int		browsers = 0;	/* Number of running browsers */
  */
 
 #ifdef HAVE_DNSSD
-static void		browse_callback(DNSServiceRef sdRef,
-			                DNSServiceFlags flags,
-				        uint32_t interfaceIndex,
-				        DNSServiceErrorType errorCode,
-				        const char *serviceName,
-				        const char *regtype,
-				        const char *replyDomain, void *context)
-					__attribute__((nonnull(1,5,6,7,8)));
-static void		browse_local_callback(DNSServiceRef sdRef,
-					      DNSServiceFlags flags,
-					      uint32_t interfaceIndex,
-					      DNSServiceErrorType errorCode,
-					      const char *serviceName,
-					      const char *regtype,
-					      const char *replyDomain,
-					      void *context)
-					      __attribute__((nonnull(1,5,6,7,8)));
+static void		browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode, const char *serviceName, const char *regtype, const char *replyDomain, void *context) _CUPS_NONNULL(1,5,6,7,8);
+static void		browse_local_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode, const char *serviceName, const char *regtype, const char *replyDomain, void *context) _CUPS_NONNULL(1,5,6,7,8);
 #endif /* HAVE_DNSSD */
 #ifdef HAVE_AVAHI
 static void		browse_callback(AvahiServiceBrowser *browser,
@@ -116,22 +101,10 @@ static void		client_callback(AvahiClient *client,
 #endif /* HAVE_AVAHI */
 
 static int		compare_devices(cups_device_t *a, cups_device_t *b);
-static void		exec_backend(char **argv) __attribute__((noreturn));
-static cups_device_t	*get_device(cups_array_t *devices,
-			            const char *serviceName,
-			            const char *regtype,
-				    const char *replyDomain)
-				    __attribute__((nonnull(1,2,3,4)));
+static void		exec_backend(char **argv) _CUPS_NORETURN;
+static cups_device_t	*get_device(cups_array_t *devices, const char *serviceName, const char *regtype, const char *replyDomain) _CUPS_NONNULL(1,2,3,4);
 #ifdef HAVE_DNSSD
-static void		query_callback(DNSServiceRef sdRef,
-			               DNSServiceFlags flags,
-				       uint32_t interfaceIndex,
-				       DNSServiceErrorType errorCode,
-				       const char *fullName, uint16_t rrtype,
-				       uint16_t rrclass, uint16_t rdlen,
-				       const void *rdata, uint32_t ttl,
-				       void *context)
-				       __attribute__((nonnull(1,5,9,11)));
+static void		query_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode, const char *fullName, uint16_t rrtype, uint16_t rrclass, uint16_t rdlen, const void *rdata, uint32_t ttl, void *context) _CUPS_NONNULL(1,5,9,11);
 #elif defined(HAVE_AVAHI)
 static int		poll_callback(struct pollfd *pollfds,
 			              unsigned int num_pollfds, int timeout,
@@ -147,8 +120,7 @@ static void		query_callback(AvahiRecordBrowser *browser,
 				       void *context);
 #endif /* HAVE_DNSSD */
 static void		sigterm_handler(int sig);
-static void		unquote(char *dst, const char *src, size_t dstsize)
-			    __attribute__((nonnull(1,2)));
+static void		unquote(char *dst, const char *src, size_t dstsize) _CUPS_NONNULL(1,2);
 
 
 /*
diff --git a/backend/testbackend.c b/backend/testbackend.c
index b8dbe3bd1..6dbd0abee 100644
--- a/backend/testbackend.c
+++ b/backend/testbackend.c
@@ -33,7 +33,7 @@ static int	job_canceled = 0;
  */
 
 static void	sigterm_handler(int sig);
-static void	usage(void) __attribute__((noreturn));
+static void	usage(void) _CUPS_NORETURN;
 static void	walk_cb(const char *oid, const char *data, int datalen,
 		        void *context);
 
diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 4f31d031a..4a85b4766 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -290,10 +290,10 @@ static void status_timer_cb(CFRunLoopTimerRef timer, void *info);
 
 #if defined(__i386__) || defined(__x86_64__)
 static pid_t	child_pid;		/* Child PID */
-static void run_legacy_backend(int argc, char *argv[], int fd) __attribute__((noreturn));	/* Starts child backend process running as a ppc executable */
+static void run_legacy_backend(int argc, char *argv[], int fd) _CUPS_NORETURN;	/* Starts child backend process running as a ppc executable */
 #endif /* __i386__ || __x86_64__ */
 static void sigterm_handler(int sig);	/* SIGTERM handler */
-static void sigquit_handler(int sig, siginfo_t *si, void *unused) __attribute__((noreturn));
+static void sigquit_handler(int sig, siginfo_t *si, void *unused) _CUPS_NORETURN;
 
 #ifdef PARSE_PS_ERRORS
 static const char *next_line (const char *buffer);