top: add -m ("memory") option

[oweals/busybox.git] / sysklogd / logread.c

diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index ace246fc43473fbfc2e327e762628b6a3dc92803..603a3776cd36dc3edae7272804c32d244d25ba14 100644 (file)
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -39,12 +39,11 @@ struct globals {
 #define SMrup (G.SMrup)
 #define SMrdn (G.SMrdn)
 #define shbuf (G.shbuf)
-#define INIT_G() \
-       do { \
-               memcpy(SMrup, init_sem, sizeof(init_sem)); \
-       } while (0)
+#define INIT_G() do { \
+       memcpy(SMrup, init_sem, sizeof(init_sem)); \
+} while (0)
 
-static void error_exit(const char *str) ATTRIBUTE_NORETURN;
+static void error_exit(const char *str) NORETURN;
 static void error_exit(const char *str)
 {
        //release all acquired resources
@@ -61,7 +60,7 @@ static void sem_up(int semid)
                error_exit("semop[SMrup]");
 }
 
-static void interrupted(int sig ATTRIBUTE_UNUSED)
+static void interrupted(int sig UNUSED_PARAM)
 {
        signal(SIGINT, SIG_IGN);
        shmdt(shbuf);
@@ -69,7 +68,7 @@ static void interrupted(int sig ATTRIBUTE_UNUSED)
 }
 
 int logread_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int logread_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int logread_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned cur;
        int log_semid; /* ipc semaphore id */