diff options
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/chpst.c | 18 | ||||
| -rw-r--r-- | runit/runit_lib.h | 6 | ||||
| -rw-r--r-- | runit/runsv.c | 6 | ||||
| -rw-r--r-- | runit/runsvdir.c | 6 | ||||
| -rw-r--r-- | runit/sv.c | 4 | ||||
| -rw-r--r-- | runit/svlogd.c | 8 |
6 files changed, 24 insertions, 24 deletions
diff --git a/runit/chpst.c b/runit/chpst.c index 4de53f0..899a4ee 100644 --- a/runit/chpst.c +++ b/runit/chpst.c @@ -282,13 +282,13 @@ static void slimit(void) } /* argv[0] */ -static void setuidgid(int, char **) ATTRIBUTE_NORETURN; -static void envuidgid(int, char **) ATTRIBUTE_NORETURN; -static void envdir(int, char **) ATTRIBUTE_NORETURN; -static void softlimit(int, char **) ATTRIBUTE_NORETURN; +static void setuidgid(int, char **) NORETURN; +static void envuidgid(int, char **) NORETURN; +static void envdir(int, char **) NORETURN; +static void softlimit(int, char **) NORETURN; int chpst_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int chpst_main(int argc ATTRIBUTE_UNUSED, char **argv) +int chpst_main(int argc UNUSED_PARAM, char **argv) { INIT_G(); @@ -347,7 +347,7 @@ int chpst_main(int argc ATTRIBUTE_UNUSED, char **argv) bb_perror_msg_and_die("exec %s", argv[0]); } -static void setuidgid(int argc ATTRIBUTE_UNUSED, char **argv) +static void setuidgid(int argc UNUSED_PARAM, char **argv) { const char *account; @@ -359,7 +359,7 @@ static void setuidgid(int argc ATTRIBUTE_UNUSED, char **argv) bb_perror_msg_and_die("exec %s", argv[0]); } -static void envuidgid(int argc ATTRIBUTE_UNUSED, char **argv) +static void envuidgid(int argc UNUSED_PARAM, char **argv) { const char *account; @@ -371,7 +371,7 @@ static void envuidgid(int argc ATTRIBUTE_UNUSED, char **argv) bb_perror_msg_and_die("exec %s", argv[0]); } -static void envdir(int argc ATTRIBUTE_UNUSED, char **argv) +static void envdir(int argc UNUSED_PARAM, char **argv) { const char *dir; @@ -383,7 +383,7 @@ static void envdir(int argc ATTRIBUTE_UNUSED, char **argv) bb_perror_msg_and_die("exec %s", argv[0]); } -static void softlimit(int argc ATTRIBUTE_UNUSED, char **argv) +static void softlimit(int argc UNUSED_PARAM, char **argv) { char *a,*c,*d,*f,*l,*m,*o,*p,*r,*s,*t; getopt32(argv, "+a:c:d:f:l:m:o:p:r:s:t:", diff --git a/runit/runit_lib.h b/runit/runit_lib.h index c94e61c..b0b6dc2 100644 --- a/runit/runit_lib.h +++ b/runit/runit_lib.h @@ -88,9 +88,9 @@ extern unsigned pmatch(const char *, const char *, unsigned); * runsv / supervise / sv stuff */ typedef struct svstatus_t { - uint64_t time_be64 ATTRIBUTE_PACKED; - uint32_t time_nsec_be32 ATTRIBUTE_PACKED; - uint32_t pid_le32 ATTRIBUTE_PACKED; + uint64_t time_be64 PACKED; + uint32_t time_nsec_be32 PACKED; + uint32_t pid_le32 PACKED; uint8_t paused; uint8_t want; uint8_t got_term; diff --git a/runit/runsv.c b/runit/runsv.c index 6981fa7..bd0f3dc 100644 --- a/runit/runsv.c +++ b/runit/runsv.c @@ -127,12 +127,12 @@ static void warn_cannot(const char *m) bb_perror_msg("%s: warning: cannot %s", dir, m); } -static void s_child(int sig_no ATTRIBUTE_UNUSED) +static void s_child(int sig_no UNUSED_PARAM) { write(selfpipe.wr, "", 1); } -static void s_term(int sig_no ATTRIBUTE_UNUSED) +static void s_term(int sig_no UNUSED_PARAM) { sigterm = 1; write(selfpipe.wr, "", 1); /* XXX */ @@ -434,7 +434,7 @@ static int ctrl(struct svdir *s, char c) } int runsv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int runsv_main(int argc ATTRIBUTE_UNUSED, char **argv) +int runsv_main(int argc UNUSED_PARAM, char **argv) { struct stat s; int fd; diff --git a/runit/runsvdir.c b/runit/runsvdir.c index df6b886..aaa4c47 100644 --- a/runit/runsvdir.c +++ b/runit/runsvdir.c @@ -89,11 +89,11 @@ static void warnx(const char *m1) warn3x(m1, "", ""); } -static void s_term(int sig_no ATTRIBUTE_UNUSED) +static void s_term(int sig_no UNUSED_PARAM) { exitsoon = 1; } -static void s_hangup(int sig_no ATTRIBUTE_UNUSED) +static void s_hangup(int sig_no UNUSED_PARAM) { exitsoon = 2; } @@ -229,7 +229,7 @@ static int setup_log(void) } int runsvdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int runsvdir_main(int argc ATTRIBUTE_UNUSED, char **argv) +int runsvdir_main(int argc UNUSED_PARAM, char **argv) { struct stat s; dev_t last_dev = last_dev; /* for gcc */ @@ -176,7 +176,7 @@ struct globals { #define INIT_G() do { } while (0) -static void fatal_cannot(const char *m1) ATTRIBUTE_NORETURN; +static void fatal_cannot(const char *m1) NORETURN; static void fatal_cannot(const char *m1) { bb_perror_msg("fatal: cannot %s", m1); @@ -293,7 +293,7 @@ static unsigned svstatus_print(const char *m) return pid ? 1 : 2; } -static int status(const char *unused ATTRIBUTE_UNUSED) +static int status(const char *unused UNUSED_PARAM) { int r; diff --git a/runit/svlogd.c b/runit/svlogd.c index bfb9716..66b96b8 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c @@ -788,14 +788,14 @@ static int buffer_pread(/*int fd, */char *s, unsigned len) return i; } -static void sig_term_handler(int sig_no ATTRIBUTE_UNUSED) +static void sig_term_handler(int sig_no UNUSED_PARAM) { if (verbose) bb_error_msg(INFO"sig%s received", "term"); exitasap = 1; } -static void sig_child_handler(int sig_no ATTRIBUTE_UNUSED) +static void sig_child_handler(int sig_no UNUSED_PARAM) { int pid, l; @@ -812,14 +812,14 @@ static void sig_child_handler(int sig_no ATTRIBUTE_UNUSED) } } -static void sig_alarm_handler(int sig_no ATTRIBUTE_UNUSED) +static void sig_alarm_handler(int sig_no UNUSED_PARAM) { if (verbose) bb_error_msg(INFO"sig%s received", "alarm"); rotateasap = 1; } -static void sig_hangup_handler(int sig_no ATTRIBUTE_UNUSED) +static void sig_hangup_handler(int sig_no UNUSED_PARAM) { if (verbose) bb_error_msg(INFO"sig%s received", "hangup"); |