ps: trade cumbersome GNU attributes with less wordy alternatives

diff --git a/ps/common.h b/ps/common.h
index 3c36528b53fc8c9b9fa09da77060ba55d4e0e9f6..a79e1ff01d76801465d880224b12b630502add2c 100644 (file)
--- a/ps/common.h
+++ b/ps/common.h
@@ -338,7 +338,7 @@ extern int want_this_proc(proc_t *buf);
 extern const char *select_bits_setup(void);
 
 /* help.c */
-extern void __attribute__ ((__noreturn__)) usage(FILE * out, int section);
+extern void usage(FILE * out, int section) NORETURN;
 
 /* global.c */
 extern void self_info(void);

diff --git a/ps/help.c b/ps/help.c
index dc68f19bf1d0062b2369c2435e0b3d049e88b85b..b0da7cb6937bbeb47ddcda024128cb9f8ba805ba 100644 (file)
--- a/ps/help.c
+++ b/ps/help.c
@@ -15,8 +15,8 @@
 
 #include "common.h"
 
-void __attribute__ ((__noreturn__)) usage(FILE * out, int section)
-{
+void usage(FILE * out, int section) NORETURN;
+void usage(FILE * out, int section){
        fputs(USAGE_HEADER, out);
        fprintf(out,
              _(" %s [options]\n"), program_invocation_short_name);

diff --git a/ps/stacktrace.c b/ps/stacktrace.c
index 60b89f442acaa66d90e343e7effcfa5600d198bf..f16a2f859c3b57a71cc507d4bcd2b40b3a75a462 100644 (file)
--- a/ps/stacktrace.c
+++ b/ps/stacktrace.c
@@ -30,7 +30,8 @@ static void debug_stop(char **args){
 }
 
 /***********/
-static void stack_trace_sigchld(int signum __attribute__ ((__unused__))){
+static void stack_trace_sigchld(int signum){
+  (void)signum;
   stack_trace_done = 1;
 }
 
@@ -156,7 +157,8 @@ void debug(int method, char *prog_name){
 }
 
 /************/
-static void stack_trace_sigsegv(int signum __attribute__ ((__unused__))){
+static void stack_trace_sigsegv(int signum){
+  (void)signum;
   debug(STACK_TRACE, stored_prog_name);
 }