last nail into error_msg() (de)capitalization

[oweals/busybox.git] / libbb / u_signal_names.c

diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index 62fab810dfce6de7179307aa306f50ce5405f63f..3f8c04c35fa05a3bd7e072d3c9007970821665fd 100644 (file)
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -9,24 +9,24 @@
 
 #include "libbb.h"
 
-static struct signal_name {
-       char *name;
+static const struct signal_name {
+       char name[5];
        int number;
 } signals[] = {
        // SUSv3 says kill must support these, and specifies the numerical values,
        // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html
        {"0", 0}, {"HUP", 1}, {"INT", 2}, {"QUIT", 3}, {"ABRT", 6}, {"KILL", 9},
-       {"ALRM", 14}, {"TERM", 15},
+       {"ALRM", 14}, {"TERM", 15},
        // And Posix adds the following:
        {"ILL", SIGILL}, {"TRAP", SIGTRAP}, {"FPE", SIGFPE}, {"USR1", SIGUSR1},
-       {"SEGV", SIGSEGV}, {"USR2", SIGUSR2}, {"PIPE", SIGPIPE}, {"CHLD", SIGCHLD},
-       {"CONT", SIGCONT}, {"STOP", SIGSTOP}, {"TSTP", SIGTSTP}, {"TTIN", SIGTTIN},
-       {"TTOU", SIGTTOU}
+       {"SEGV", SIGSEGV}, {"USR2", SIGUSR2}, {"PIPE", SIGPIPE}, {"CHLD", SIGCHLD},
+       {"CONT", SIGCONT}, {"STOP", SIGSTOP}, {"TSTP", SIGTSTP}, {"TTIN", SIGTTIN},
+       {"TTOU", SIGTTOU}
 };
 
 // Convert signal name to number.
 
-int get_signum(char *name)
+int get_signum(const char *name)
 {
        int i;
 
@@ -42,18 +42,17 @@ int get_signum(char *name)
 
 // Convert signal number to name
 
-char *get_signame(int number)
+const char *get_signame(int number)
 {
        int i;
        static char buf[8];
 
-       itoa_to_buf(number, buf, 8);
        for (i=0; i < sizeof(signals) / sizeof(struct signal_name); i++) {
                if (number == signals[i].number) {
-                       sprintf("SIG%s", signals[i].name);
-                       break;
+                       return signals[i].name;
                }
        }
 
+       itoa_to_buf(number, buf, 8);
        return buf;
 }