diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-05 09:18:54 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-05 09:18:54 +0000 |
| commit | a60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch) | |
| tree | f59bc665cfe3d2d32622450d80523e3c1265e501 /init | |
| parent | f6efccc0659a2e2978f2021153f34ce92257ad2b (diff) | |
| download | busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.gz busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.bz2 busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.zip | |
*: rename ATTRIBUTE_XXX to just XXX.
Diffstat (limited to 'init')
| -rw-r--r-- | init/halt.c | 2 | ||||
| -rw-r--r-- | init/init.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/init/halt.c b/init/halt.c index 4fac3a86b..207069e12 100644 --- a/init/halt.c +++ b/init/halt.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #endif | 16 | #endif |
| 17 | 17 | ||
| 18 | int halt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 18 | int halt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 19 | int halt_main(int argc ATTRIBUTE_UNUSED, char **argv) | 19 | int halt_main(int argc UNUSED_PARAM, char **argv) |
| 20 | { | 20 | { |
| 21 | static const int magic[] = { | 21 | static const int magic[] = { |
| 22 | #ifdef RB_HALT_SYSTEM | 22 | #ifdef RB_HALT_SYSTEM |
diff --git a/init/init.c b/init/init.c index e3993896d..232896709 100644 --- a/init/init.c +++ b/init/init.c | |||
| @@ -96,7 +96,7 @@ static const char *const environment[] = { | |||
| 96 | 96 | ||
| 97 | /* Function prototypes */ | 97 | /* Function prototypes */ |
| 98 | static void delete_init_action(struct init_action *a); | 98 | static void delete_init_action(struct init_action *a); |
| 99 | static void halt_reboot_pwoff(int sig) ATTRIBUTE_NORETURN; | 99 | static void halt_reboot_pwoff(int sig) NORETURN; |
| 100 | 100 | ||
| 101 | static void waitfor(pid_t pid) | 101 | static void waitfor(pid_t pid) |
| 102 | { | 102 | { |
| @@ -110,7 +110,7 @@ static void waitfor(pid_t pid) | |||
| 110 | continue; | 110 | continue; |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | static void loop_forever(void) ATTRIBUTE_NORETURN; | 113 | static void loop_forever(void) NORETURN; |
| 114 | static void loop_forever(void) | 114 | static void loop_forever(void) |
| 115 | { | 115 | { |
| 116 | while (1) | 116 | while (1) |
| @@ -594,7 +594,7 @@ static void halt_reboot_pwoff(int sig) | |||
| 594 | 594 | ||
| 595 | /* Handler for QUIT - exec "restart" action, | 595 | /* Handler for QUIT - exec "restart" action, |
| 596 | * else (no such action defined) do nothing */ | 596 | * else (no such action defined) do nothing */ |
| 597 | static void exec_restart_action(int sig ATTRIBUTE_UNUSED) | 597 | static void exec_restart_action(int sig UNUSED_PARAM) |
| 598 | { | 598 | { |
| 599 | struct init_action *a; | 599 | struct init_action *a; |
| 600 | 600 | ||
| @@ -617,13 +617,13 @@ static void exec_restart_action(int sig ATTRIBUTE_UNUSED) | |||
| 617 | } | 617 | } |
| 618 | } | 618 | } |
| 619 | 619 | ||
| 620 | static void ctrlaltdel_signal(int sig ATTRIBUTE_UNUSED) | 620 | static void ctrlaltdel_signal(int sig UNUSED_PARAM) |
| 621 | { | 621 | { |
| 622 | run_actions(CTRLALTDEL); | 622 | run_actions(CTRLALTDEL); |
| 623 | } | 623 | } |
| 624 | 624 | ||
| 625 | /* The SIGSTOP & SIGTSTP handler */ | 625 | /* The SIGSTOP & SIGTSTP handler */ |
| 626 | static void stop_handler(int sig ATTRIBUTE_UNUSED) | 626 | static void stop_handler(int sig UNUSED_PARAM) |
| 627 | { | 627 | { |
| 628 | int saved_errno = errno; | 628 | int saved_errno = errno; |
| 629 | 629 | ||
| @@ -635,7 +635,7 @@ static void stop_handler(int sig ATTRIBUTE_UNUSED) | |||
| 635 | } | 635 | } |
| 636 | 636 | ||
| 637 | /* The SIGCONT handler */ | 637 | /* The SIGCONT handler */ |
| 638 | static void cont_handler(int sig ATTRIBUTE_UNUSED) | 638 | static void cont_handler(int sig UNUSED_PARAM) |
| 639 | { | 639 | { |
| 640 | got_cont = 1; | 640 | got_cont = 1; |
| 641 | } | 641 | } |
| @@ -790,7 +790,7 @@ static void parse_inittab(void) | |||
| 790 | } | 790 | } |
| 791 | 791 | ||
| 792 | #if ENABLE_FEATURE_USE_INITTAB | 792 | #if ENABLE_FEATURE_USE_INITTAB |
| 793 | static void reload_signal(int sig ATTRIBUTE_UNUSED) | 793 | static void reload_signal(int sig UNUSED_PARAM) |
| 794 | { | 794 | { |
| 795 | struct init_action *a, *tmp; | 795 | struct init_action *a, *tmp; |
| 796 | 796 | ||
| @@ -838,7 +838,7 @@ static void reload_signal(int sig ATTRIBUTE_UNUSED) | |||
| 838 | #endif | 838 | #endif |
| 839 | 839 | ||
| 840 | int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 840 | int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 841 | int init_main(int argc ATTRIBUTE_UNUSED, char **argv) | 841 | int init_main(int argc UNUSED_PARAM, char **argv) |
| 842 | { | 842 | { |
| 843 | struct init_action *a; | 843 | struct init_action *a; |
| 844 | pid_t wpid; | 844 | pid_t wpid; |