Move debug level string conversion functions to wpa_debug.c

This makes it possible to use these helper functions from hostapd as
well as the current use in wpa_supplicant.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/utils/wpa_debug.c b/src/utils/wpa_debug.c
index 3c26301..61c0d5c 100644 (file)
--- a/src/utils/wpa_debug.c
+++ b/src/utils/wpa_debug.c
@@ -819,3 +819,42 @@ void hostapd_logger(void *ctx, const u8 *addr, unsigned int module, int level,
        bin_clear_free(buf, buflen);
 }
 #endif /* CONFIG_NO_HOSTAPD_LOGGER */
+
+
+const char * debug_level_str(int level)
+{
+       switch (level) {
+       case MSG_EXCESSIVE:
+               return "EXCESSIVE";
+       case MSG_MSGDUMP:
+               return "MSGDUMP";
+       case MSG_DEBUG:
+               return "DEBUG";
+       case MSG_INFO:
+               return "INFO";
+       case MSG_WARNING:
+               return "WARNING";
+       case MSG_ERROR:
+               return "ERROR";
+       default:
+               return "?";
+       }
+}
+
+
+int str_to_debug_level(const char *s)
+{
+       if (os_strcasecmp(s, "EXCESSIVE") == 0)
+               return MSG_EXCESSIVE;
+       if (os_strcasecmp(s, "MSGDUMP") == 0)
+               return MSG_MSGDUMP;
+       if (os_strcasecmp(s, "DEBUG") == 0)
+               return MSG_DEBUG;
+       if (os_strcasecmp(s, "INFO") == 0)
+               return MSG_INFO;
+       if (os_strcasecmp(s, "WARNING") == 0)
+               return MSG_WARNING;
+       if (os_strcasecmp(s, "ERROR") == 0)
+               return MSG_ERROR;
+       return -1;
+}

diff --git a/src/utils/wpa_debug.h b/src/utils/wpa_debug.h
index 87bd7fa..17d8f96 100644 (file)
--- a/src/utils/wpa_debug.h
+++ b/src/utils/wpa_debug.h
@@ -364,4 +364,7 @@ static inline void wpa_debug_close_linux_tracing(void)
 #define WPA_ASSERT(a) do { } while (0)
 #endif
 
+const char * debug_level_str(int level);
+int str_to_debug_level(const char *s);
+
 #endif /* WPA_DEBUG_H */

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index cbb877e..3f533ce 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2136,45 +2136,6 @@ static int wpa_supplicant_ctrl_iface_blacklist(struct wpa_supplicant *wpa_s,
 }
 
 
-static const char * debug_level_str(int level)
-{
-       switch (level) {
-       case MSG_EXCESSIVE:
-               return "EXCESSIVE";
-       case MSG_MSGDUMP:
-               return "MSGDUMP";
-       case MSG_DEBUG:
-               return "DEBUG";
-       case MSG_INFO:
-               return "INFO";
-       case MSG_WARNING:
-               return "WARNING";
-       case MSG_ERROR:
-               return "ERROR";
-       default:
-               return "?";
-       }
-}
-
-
-static int str_to_debug_level(const char *s)
-{
-       if (os_strcasecmp(s, "EXCESSIVE") == 0)
-               return MSG_EXCESSIVE;
-       if (os_strcasecmp(s, "MSGDUMP") == 0)
-               return MSG_MSGDUMP;
-       if (os_strcasecmp(s, "DEBUG") == 0)
-               return MSG_DEBUG;
-       if (os_strcasecmp(s, "INFO") == 0)
-               return MSG_INFO;
-       if (os_strcasecmp(s, "WARNING") == 0)
-               return MSG_WARNING;
-       if (os_strcasecmp(s, "ERROR") == 0)
-               return MSG_ERROR;
-       return -1;
-}
-
-
 static int wpa_supplicant_ctrl_iface_log_level(struct wpa_supplicant *wpa_s,
                                               char *cmd, char *buf,
                                               size_t buflen)