diff options
29 files changed, 80 insertions, 558 deletions
diff --git a/plugins/cinterion/tests/test-modem-helpers-cinterion.c b/plugins/cinterion/tests/test-modem-helpers-cinterion.c index 88e0f74c..0baeec30 100644 --- a/plugins/cinterion/tests/test-modem-helpers-cinterion.c +++ b/plugins/cinterion/tests/test-modem-helpers-cinterion.c @@ -21,7 +21,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-cinterion.h" @@ -858,27 +858,6 @@ test_ctzu_urc_full (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/plugins/huawei/tests/test-modem-helpers-huawei.c b/plugins/huawei/tests/test-modem-helpers-huawei.c index 18ac85a5..1aa50c9e 100644 --- a/plugins/huawei/tests/test-modem-helpers-huawei.c +++ b/plugins/huawei/tests/test-modem-helpers-huawei.c @@ -22,6 +22,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> +#include "mm-log-test.h" #include "mm-log-object.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-huawei.h" @@ -1248,27 +1249,6 @@ test_hcsq (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/plugins/icera/tests/test-modem-helpers-icera.c b/plugins/icera/tests/test-modem-helpers-icera.c index ef9d62cc..518e9afd 100644 --- a/plugins/icera/tests/test-modem-helpers-icera.c +++ b/plugins/icera/tests/test-modem-helpers-icera.c @@ -24,7 +24,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-icera.h" @@ -175,27 +175,6 @@ test_ipdpaddr (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/plugins/linktop/tests/test-modem-helpers-linktop.c b/plugins/linktop/tests/test-modem-helpers-linktop.c index 396abaae..07aa8378 100644 --- a/plugins/linktop/tests/test-modem-helpers-linktop.c +++ b/plugins/linktop/tests/test-modem-helpers-linktop.c @@ -21,7 +21,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-linktop.h" @@ -59,27 +59,6 @@ test_cfun_query_current_modes (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/plugins/mbm/tests/test-modem-helpers-mbm.c b/plugins/mbm/tests/test-modem-helpers-mbm.c index da33522c..4169140a 100644 --- a/plugins/mbm/tests/test-modem-helpers-mbm.c +++ b/plugins/mbm/tests/test-modem-helpers-mbm.c @@ -24,7 +24,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-mbm.h" @@ -253,27 +253,6 @@ test_cfun_query_current_modes (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/plugins/sierra/tests/test-modem-helpers-sierra.c b/plugins/sierra/tests/test-modem-helpers-sierra.c index ad25ec9b..b0c66496 100644 --- a/plugins/sierra/tests/test-modem-helpers-sierra.c +++ b/plugins/sierra/tests/test-modem-helpers-sierra.c @@ -22,7 +22,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-sierra.h" @@ -115,27 +115,6 @@ test_scact_read_response_multiple (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/plugins/simtech/tests/test-modem-helpers-simtech.c b/plugins/simtech/tests/test-modem-helpers-simtech.c index f1109534..d5d774f2 100644 --- a/plugins/simtech/tests/test-modem-helpers-simtech.c +++ b/plugins/simtech/tests/test-modem-helpers-simtech.c @@ -21,7 +21,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-simtech.h" @@ -317,27 +317,6 @@ test_rxdtmf_urc_one_cr (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/plugins/telit/tests/test-mm-modem-helpers-telit.c b/plugins/telit/tests/test-mm-modem-helpers-telit.c index b6083816..251abd1e 100644 --- a/plugins/telit/tests/test-mm-modem-helpers-telit.c +++ b/plugins/telit/tests/test-mm-modem-helpers-telit.c @@ -23,7 +23,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-telit.h" @@ -572,27 +572,6 @@ test_telit_parse_qss_query (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/plugins/tests/test-keyfiles.c b/plugins/tests/test-keyfiles.c index 173893be..d528cac9 100644 --- a/plugins/tests/test-keyfiles.c +++ b/plugins/tests/test-keyfiles.c @@ -23,7 +23,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" /************************************************************/ @@ -64,27 +64,6 @@ test_foxconn_t77w968 (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/plugins/tests/test-udev-rules.c b/plugins/tests/test-udev-rules.c index e12f07ac..36cc4120 100644 --- a/plugins/tests/test-udev-rules.c +++ b/plugins/tests/test-udev-rules.c @@ -25,7 +25,7 @@ #include <libmm-glib.h> #include "mm-kernel-device-generic-rules.h" -#include "mm-log.h" +#include "mm-log-test.h" /************************************************************/ @@ -162,27 +162,6 @@ test_fibocom (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/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c b/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c index c3c76f09..bdc073d0 100644 --- a/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c +++ b/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c @@ -24,7 +24,7 @@ #include "mm-modem-helpers.h" #include "mm-modem-helpers-thuraya.h" -#include "mm-log.h" +#include "mm-log-test.h" /*****************************************************************************/ /* Test CPMS response */ @@ -87,27 +87,6 @@ test_cpms_response_thuraya (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/plugins/ublox/tests/test-modem-helpers-ublox.c b/plugins/ublox/tests/test-modem-helpers-ublox.c index b2999ee8..2d662877 100644 --- a/plugins/ublox/tests/test-modem-helpers-ublox.c +++ b/plugins/ublox/tests/test-modem-helpers-ublox.c @@ -22,7 +22,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-ublox.h" @@ -979,27 +979,6 @@ test_ugcntrd_response (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/plugins/xmm/tests/test-modem-helpers-xmm.c b/plugins/xmm/tests/test-modem-helpers-xmm.c index 39aa8ccc..e40ffcab 100644 --- a/plugins/xmm/tests/test-modem-helpers-xmm.c +++ b/plugins/xmm/tests/test-modem-helpers-xmm.c @@ -22,7 +22,7 @@ #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-modem-helpers.h" #include "mm-modem-helpers-xmm.h" @@ -754,27 +754,6 @@ test_xlcsslp_queries (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/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, ""); diff --git a/test/mmrules.c b/test/mmrules.c index 29b32fba..3538f44d 100644 --- a/test/mmrules.c +++ b/test/mmrules.c @@ -23,7 +23,7 @@ #include <glib.h> #include <gio/gio.h> -#include <mm-log.h> +#include <mm-log-test.h> #include <mm-kernel-device-generic-rules.h> #define PROGRAM_NAME "mmrules" @@ -50,27 +50,6 @@ static GOptionEntry main_entries[] = { { NULL } }; -void -_mm_log (gpointer obj, - const char *loc, - const char *func, - guint32 level, - const char *fmt, - ...) -{ - va_list args; - gchar *msg; - - if (!verbose_flag) - return; - - va_start (args, fmt); - msg = g_strdup_vprintf (fmt, args); - va_end (args); - g_print ("%s\n", msg); - g_free (msg); -} - static void print_version_and_exit (void) { diff --git a/test/mmsmspdu.c b/test/mmsmspdu.c index ef27074c..3a56ffc5 100644 --- a/test/mmsmspdu.c +++ b/test/mmsmspdu.c @@ -26,7 +26,7 @@ #include <ModemManager.h> #define _LIBMM_INSIDE_MM #include <libmm-glib.h> -#include "mm-log.h" +#include "mm-log-test.h" #include "mm-sms-part-3gpp.h" #define PROGRAM_NAME "mmsmspdu" @@ -163,27 +163,6 @@ show_part_info (MMSmsPart *part) } } -void -_mm_log (gpointer obj, - const char *loc, - const char *func, - guint32 level, - const char *fmt, - ...) -{ - va_list args; - gchar *msg; - - if (!verbose_flag) - return; - - va_start (args, fmt); - msg = g_strdup_vprintf (fmt, args); - va_end (args); - g_print ("%s\n", msg); - g_free (msg); -} - static void print_version_and_exit (void) { diff --git a/test/mmtty.c b/test/mmtty.c index f7852cd4..28df6285 100644 --- a/test/mmtty.c +++ b/test/mmtty.c @@ -23,7 +23,7 @@ #include <glib.h> #include <gio/gio.h> -#include <mm-log.h> +#include <mm-log-test.h> #include <mm-port-serial.h> #include <mm-port-serial-at.h> #include <mm-serial-parsers.h> @@ -83,27 +83,6 @@ signals_handler (int signum) } } -void -_mm_log (gpointer obj, - const char *loc, - const char *func, - guint32 level, - const char *fmt, - ...) -{ - va_list args; - gchar *msg; - - if (!verbose_flag) - return; - - va_start (args, fmt); - msg = g_strdup_vprintf (fmt, args); - va_end (args); - g_print ("%s\n", msg); - g_free (msg); -} - static void print_version_and_exit (void) { |