logger: mark decode/pencode as static

Move these functions to the top of the file where they can be marked
static and the prototypes can be removed.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 19b4c479ab4bd4165387f123835a952ce6f8d575..b3fa54635de85d07a0cde7cefd0e6f1eb4205c9d 100644 (file)
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -58,12 +58,46 @@
 #define        SYSLOG_NAMES
 #include <syslog.h>
 
-int    decode (char *, CODE *);
-int    pencode (char *);
-
 static int optd = 0;
 static uint16_t udpport = 514;
 
+static int decode(char *name, CODE *codetab)
+{
+       register CODE *c;
+
+       if (isdigit(*name))
+               return (atoi(name));
+
+       for (c = codetab; c->c_name; c++)
+               if (!strcasecmp(name, c->c_name))
+                       return (c->c_val);
+
+       return -1;
+}
+
+static int pencode(char *s)
+{
+       char *save;
+       int fac, lev;
+
+       for (save = s; *s && *s != '.'; ++s);
+       if (*s) {
+               *s = '\0';
+               fac = decode(save, facilitynames);
+               if (fac < 0)
+                       errx(EXIT_FAILURE, _("unknown facility name: %s."), save);
+               *s++ = '.';
+       }
+       else {
+               fac = LOG_USER;
+               s = save;
+       }
+       lev = decode(s, prioritynames);
+       if (lev < 0)
+               errx(EXIT_FAILURE, _("unknown priority name: %s."), save);
+       return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
+}
+
 static int
 myopenlog(const char *sock) {
        int fd;
@@ -302,47 +336,3 @@ main(int argc, char **argv) {
 
        return EXIT_SUCCESS;
 }
-
-/*
- *  Decode a symbolic name to a numeric value
- */
-int
-pencode(char *s)
-{
-       char *save;
-       int fac, lev;
-
-       for (save = s; *s && *s != '.'; ++s);
-       if (*s) {
-               *s = '\0';
-               fac = decode(save, facilitynames);
-               if (fac < 0)
-                       errx(EXIT_FAILURE,
-                           _("unknown facility name: %s."), save);
-               *s++ = '.';
-       }
-       else {
-               fac = LOG_USER;
-               s = save;
-       }
-       lev = decode(s, prioritynames);
-       if (lev < 0)
-               errx(EXIT_FAILURE,
-                   _("unknown priority name: %s."), save);
-       return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
-}
-
-int
-decode(char *name, CODE *codetab)
-{
-       register CODE *c;
-
-       if (isdigit(*name))
-               return (atoi(name));
-
-       for (c = codetab; c->c_name; c++)
-               if (!strcasecmp(name, c->c_name))
-                       return (c->c_val);
-
-       return (-1);
-}