log: common logging method definition for all testers and helpers

13 files changed, 64 insertions, 207 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index cb50d2b8..e80c10aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,6 +101,7 @@ libhelpers_la_SOURCES = \
 	mm-log-object.c \
 	mm-log.c \
 	mm-log.h \
+	mm-log-test.h \
 	mm-error-helpers.c \
 	mm-error-helpers.h \
 	mm-modem-helpers.c \
diff --git a/src/mm-log-test.h b/src/mm-log-test.h
new file mode 100644
index 00000000..056de53b
--- /dev/null
+++ b/src/mm-log-test.h
@@ -0,0 +1,45 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2020 Aleksander Morgado <aleksander@aleksander.es>
+ */
+
+#ifndef MM_LOG_TEST_H
+#define MM_LOG_TEST_H
+
+#include <glib.h>
+#include "mm-log.h"
+
+/* This is a common logging method to be used by all test applications */
+
+void
+_mm_log (gpointer     obj,
+         const gchar *loc,
+         const gchar *func,
+         guint32      level,
+         const gchar *fmt,
+         ...)
+{
+    va_list  args;
+    gchar   *msg;
+
+    if (!g_test_verbose ())
+        return;
+
+    va_start (args, fmt);
+    msg = g_strdup_vprintf (fmt, args);
+    va_end (args);
+    g_print ("%s\n", msg);
+    g_free (msg);
+}
+
+#endif /* MM_LOG_TEST_H */
diff --git a/src/mm-log.c b/src/mm-log.c
index f15ce5c9..339e7955 100644
--- a/src/mm-log.c
+++ b/src/mm-log.c
@@ -202,11 +202,11 @@ log_backend_systemd_journal (const char *loc,
 #endif
 
 void
-_mm_log (gpointer    obj,
-         const char *loc,
-         const char *func,
-         MMLogLevel level,
-         const char *fmt,
+_mm_log (gpointer     obj,
+         const gchar *loc,
+         const gchar *func,
+         MMLogLevel   level,
+         const gchar *fmt,
          ...)
 {
     va_list args;
diff --git a/src/mm-log.h b/src/mm-log.h
index 934b41c2..0145c9aa 100644
--- a/src/mm-log.h
+++ b/src/mm-log.h
@@ -37,11 +37,11 @@ typedef enum {
 #define mm_info(...) mm_obj_info (NULL, ## __VA_ARGS__ )
 #define mm_dbg(...)  mm_obj_dbg  (NULL, ## __VA_ARGS__ )
 
-void _mm_log (gpointer    obj,
-              const char *loc,
-              const char *func,
-              MMLogLevel level,
-              const char *fmt,
+void _mm_log (gpointer     obj,
+              const gchar *loc,
+              const gchar *func,
+              MMLogLevel   level,
+              const gchar *fmt,
               ...)  __attribute__((__format__ (__printf__, 5, 6)));
 
 gboolean mm_log_set_level (const char *level, GError **error);
diff --git a/src/tests/test-at-serial-port.c b/src/tests/test-at-serial-port.c
index 2d57d30e..2147df4d 100644
--- a/src/tests/test-at-serial-port.c
+++ b/src/tests/test-at-serial-port.c
@@ -18,7 +18,7 @@
 #include <glib.h>
 
 #include "mm-port-serial-at.h"
-#include "mm-log.h"
+#include "mm-log-test.h"
 
 typedef struct {
     const gchar *original;
@@ -64,27 +64,6 @@ at_serial_echo_removal (void)
     }
 }
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 int main (int argc, char **argv)
 {
     g_test_init (&argc, &argv, NULL);
diff --git a/src/tests/test-charsets.c b/src/tests/test-charsets.c
index b8a92575..5c9e1875 100644
--- a/src/tests/test-charsets.c
+++ b/src/tests/test-charsets.c
@@ -18,7 +18,7 @@
 #include <locale.h>
 
 #include "mm-modem-helpers.h"
-#include "mm-log.h"
+#include "mm-log-test.h"
 
 static void
 common_test_gsm7 (const gchar *in_utf8)
@@ -408,27 +408,6 @@ test_charset_can_covert_to (void)
     }
 }
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 int main (int argc, char **argv)
 {
     setlocale (LC_ALL, "");
diff --git a/src/tests/test-error-helpers.c b/src/tests/test-error-helpers.c
index ae2b8626..ddff9a0d 100644
--- a/src/tests/test-error-helpers.c
+++ b/src/tests/test-error-helpers.c
@@ -52,27 +52,6 @@ TEST_ERROR_HELPER (MESSAGE_ERROR,          message_error,          MessageError)
 
 /*****************************************************************************/
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 int main (int argc, char **argv)
 {
     setlocale (LC_ALL, "");
diff --git a/src/tests/test-modem-helpers-qmi.c b/src/tests/test-modem-helpers-qmi.c
index e1f6af64..fbd6cdba 100644
--- a/src/tests/test-modem-helpers-qmi.c
+++ b/src/tests/test-modem-helpers-qmi.c
@@ -21,7 +21,7 @@
 
 #include "mm-enums-types.h"
 #include "mm-modem-helpers-qmi.h"
-#include "mm-log.h"
+#include "mm-log-test.h"
 
 static void
 test_capabilities_expected (MMQmiCapabilitiesContext *ctx,
@@ -309,27 +309,6 @@ test_gobi3k_cdma (void)
 
 /*****************************************************************************/
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 int main (int argc, char **argv)
 {
     setlocale (LC_ALL, "");
diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c
index 3a4fdd63..653bc5e9 100644
--- a/src/tests/test-modem-helpers.c
+++ b/src/tests/test-modem-helpers.c
@@ -22,7 +22,7 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 #include "mm-modem-helpers.h"
-#include "mm-log.h"
+#include "mm-log-test.h"
 
 #define g_assert_cmpfloat_tolerance(val1, val2, tolerance)  \
     g_assert_cmpfloat (fabs (val1 - val2), <, tolerance)
@@ -4424,27 +4424,6 @@ test_bcd_to_string (void *f, gpointer d)
 
 /*****************************************************************************/
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (GTestFixtureFunc) t, NULL)
 
 int main (int argc, char **argv)
diff --git a/src/tests/test-qcdm-serial-port.c b/src/tests/test-qcdm-serial-port.c
index db20f9aa..0b14282c 100644
--- a/src/tests/test-qcdm-serial-port.c
+++ b/src/tests/test-qcdm-serial-port.c
@@ -34,7 +34,7 @@
 #include "libqcdm/src/utils.h"
 #include "libqcdm/src/com.h"
 #include "libqcdm/src/errors.h"
-#include "mm-log.h"
+#include "mm-log-test.h"
 
 typedef struct {
     int master;
@@ -437,27 +437,6 @@ test_pty_cleanup (TestData *d)
     }
 }
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 typedef void (*TCFunc) (TestData *, gconstpointer);
 #define TESTCASE_PTY(s, t) g_test_add (s, TestData, NULL, (TCFunc)test_pty_create, (TCFunc)t, (TCFunc)test_pty_cleanup);
 
diff --git a/src/tests/test-sms-part-3gpp.c b/src/tests/test-sms-part-3gpp.c
index 9889a4e9..c3d59d87 100644
--- a/src/tests/test-sms-part-3gpp.c
+++ b/src/tests/test-sms-part-3gpp.c
@@ -24,7 +24,7 @@
 #include <libmm-glib.h>
 
 #include "mm-sms-part-3gpp.h"
-#include "mm-log.h"
+#include "mm-log-test.h"
 
 /********************* PDU PARSER TESTS *********************/
 
@@ -841,27 +841,6 @@ test_text_split_two_pdu_ucs2 (void)
 
 /************************************************************/
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 int main (int argc, char **argv)
 {
     setlocale (LC_ALL, "");
diff --git a/src/tests/test-sms-part-cdma.c b/src/tests/test-sms-part-cdma.c
index 7bb2bf65..af01b5f5 100644
--- a/src/tests/test-sms-part-cdma.c
+++ b/src/tests/test-sms-part-cdma.c
@@ -23,7 +23,7 @@
 #include <libmm-glib.h>
 
 #include "mm-sms-part-cdma.h"
-#include "mm-log.h"
+#include "mm-log-test.h"
 
 /********************* PDU PARSER TESTS *********************/
 
@@ -502,27 +502,6 @@ test_create_pdu_text_unicode_encoding (void)
 
 /************************************************************/
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 int main (int argc, char **argv)
 {
     setlocale (LC_ALL, "");
diff --git a/src/tests/test-udev-rules.c b/src/tests/test-udev-rules.c
index cc594918..cdc962e0 100644
--- a/src/tests/test-udev-rules.c
+++ b/src/tests/test-udev-rules.c
@@ -23,7 +23,7 @@
 #include <libmm-glib.h>
 
 #include "mm-kernel-device-generic-rules.h"
-#include "mm-log.h"
+#include "mm-log-test.h"
 
 /************************************************************/
 
@@ -43,27 +43,6 @@ test_load_cleanup_core (void)
 
 /************************************************************/
 
-void
-_mm_log (gpointer obj,
-         const char *loc,
-         const char *func,
-         guint32 level,
-         const char *fmt,
-         ...)
-{
-    va_list args;
-    gchar *msg;
-
-    if (!g_test_verbose ())
-        return;
-
-    va_start (args, fmt);
-    msg = g_strdup_vprintf (fmt, args);
-    va_end (args);
-    g_print ("%s\n", msg);
-    g_free (msg);
-}
-
 int main (int argc, char **argv)
 {
     setlocale (LC_ALL, "");