tools: staticize functions that are now only used in log.c

diff --git a/tools/log.c b/tools/log.c
index c6887bd75b1b31063ae5d98570019be7b3eb9133..745f5b3d3f7cf317bd46aed57ad19256095e0c1b 100644 (file)
--- a/tools/log.c
+++ b/tools/log.c
@@ -27,22 +27,40 @@
 static bool log_use_syslog;
 static int log_priority = LOG_ERR;
 
-void log_open(bool use_syslog)
+static _always_inline_ const char *prio_to_str(int prio)
 {
-       log_use_syslog = use_syslog;
-
-       if (log_use_syslog)
-               openlog(binname, LOG_CONS, LOG_DAEMON);
-}
+       const char *prioname;
+       char buf[32];
+
+       switch (prio) {
+       case LOG_CRIT:
+               prioname = "FATAL";
+               break;
+       case LOG_ERR:
+               prioname = "ERROR";
+               break;
+       case LOG_WARNING:
+               prioname = "WARNING";
+               break;
+       case LOG_NOTICE:
+               prioname = "NOTICE";
+               break;
+       case LOG_INFO:
+               prioname = "INFO";
+               break;
+       case LOG_DEBUG:
+               prioname = "DEBUG";
+               break;
+       default:
+               snprintf(buf, sizeof(buf), "LOG-%03d", prio);
+               prioname = buf;
+       }
 
-void log_close(void)
-{
-       if (log_use_syslog)
-               closelog();
+       return prioname;
 }
 
-void log_kmod(void *data, int priority, const char *file, int line,
-             const char *fn, const char *format, va_list args)
+static void log_kmod(void *data, int priority, const char *file, int line,
+                    const char *fn, const char *format, va_list args)
 {
        const char *prioname = prio_to_str(priority);
        char *str;
@@ -69,6 +87,19 @@ void log_kmod(void *data, int priority, const char *file, int line,
        free(str);
        (void)data;
 }
+void log_open(bool use_syslog)
+{
+       log_use_syslog = use_syslog;
+
+       if (log_use_syslog)
+               openlog(binname, LOG_CONS, LOG_DAEMON);
+}
+
+void log_close(void)
+{
+       if (log_use_syslog)
+               closelog();
+}
 
 void log_printf(int prio, const char *fmt, ...)
 {

diff --git a/tools/log.h b/tools/log.h
index 90817a38d854946edb36a413f6756f19e1511170..fcd930a02e7ca8ac24e1a927e2fa949cfd1a6447 100644 (file)
--- a/tools/log.h
+++ b/tools/log.h
@@ -26,8 +26,6 @@
 
 void log_open(bool use_syslog);
 void log_close(void);
-void log_kmod(void *data, int priority, const char *file, int line,
-             const char *fn, const char *format, va_list args);
 void log_printf(int prio, const char *fmt, ...);
 #define CRIT(...) log_printf(LOG_CRIT, __VA_ARGS__)
 #define ERR(...) log_printf(LOG_ERR, __VA_ARGS__)
@@ -37,40 +35,3 @@ void log_printf(int prio, const char *fmt, ...);
 
 struct kmod_ctx;
 void log_setup_kmod_log(struct kmod_ctx *ctx, int priority);
-
-_always_inline_ const char *prio_to_str(int prio);
-
-
-/* inline functions */
-
-_always_inline_ const char *prio_to_str(int prio)
-{
-       const char *prioname;
-       char buf[32];
-
-       switch (prio) {
-       case LOG_CRIT:
-               prioname = "FATAL";
-               break;
-       case LOG_ERR:
-               prioname = "ERROR";
-               break;
-       case LOG_WARNING:
-               prioname = "WARNING";
-               break;
-       case LOG_NOTICE:
-               prioname = "NOTICE";
-               break;
-       case LOG_INFO:
-               prioname = "INFO";
-               break;
-       case LOG_DEBUG:
-               prioname = "DEBUG";
-               break;
-       default:
-               snprintf(buf, sizeof(buf), "LOG-%03d", prio);
-               prioname = buf;
-       }
-
-       return prioname;
-}