diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-04-03 15:34:42 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-04-08 16:35:09 +0200 |
| commit | fd1464cff04017f283ee296f81acb18f0c2ae7ab (patch) | |
| tree | 788e4da11a2780e0407d46549cb1a04017f2e960 | |
| parent | b682d7ec673b78446ed5cbd1d276e4e6f363ee3d (diff) | |
modem-helpers: port device identifier to use object logging and autoptr
| -rw-r--r-- | src/mm-broadband-modem.c | 1 | ||||
| -rw-r--r-- | src/mm-modem-helpers.c | 31 | ||||
| -rw-r--r-- | src/mm-modem-helpers.h | 5 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers.c | 1 |
4 files changed, 18 insertions, 20 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 011662d1..2a27fdd7 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -11760,6 +11760,7 @@ mm_broadband_modem_create_device_identifier (MMBroadbandModem *self, return (mm_create_device_identifier ( mm_base_modem_get_vendor_id (MM_BASE_MODEM (self)), mm_base_modem_get_product_id (MM_BASE_MODEM (self)), + self, ati, ati1, mm_gdbus_modem_get_equipment_identifier ( diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 15fba359..ac9802a4 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -31,7 +31,7 @@ #include "mm-sms-part.h" #include "mm-modem-helpers.h" #include "mm-helper-enums-types.h" -#include "mm-log.h" +#include "mm-log-object.h" /*****************************************************************************/ @@ -254,8 +254,9 @@ mm_find_bit_set (gulong number) /*****************************************************************************/ gchar * -mm_create_device_identifier (guint vid, - guint pid, +mm_create_device_identifier (guint vid, + guint pid, + gpointer log_object, const gchar *ati, const gchar *ati1, const gchar *gsn, @@ -263,9 +264,11 @@ mm_create_device_identifier (guint vid, const gchar *model, const gchar *manf) { - GString *devid, *msg = NULL; - GChecksum *sum; - gchar *p, *ret = NULL; + g_autoptr(GString) devid = NULL; + g_autoptr(GString) msg = NULL; + g_autoptr(GChecksum) sum = NULL; + const gchar *ret; + gchar *p = NULL; gchar str_vid[10], str_pid[10]; /* Build up the device identifier */ @@ -286,14 +289,11 @@ mm_create_device_identifier (guint vid, if (manf) g_string_append (devid, manf); - if (!strlen (devid->str)) { - g_string_free (devid, TRUE); + if (!strlen (devid->str)) return NULL; - } p = devid->str; msg = g_string_sized_new (strlen (devid->str) + 17); - sum = g_checksum_new (G_CHECKSUM_SHA1); if (vid) { @@ -315,15 +315,10 @@ mm_create_device_identifier (guint vid, } p++; } - ret = g_strdup (g_checksum_get_string (sum)); - g_checksum_free (sum); - mm_dbg ("Device ID source '%s'", msg->str); - mm_dbg ("Device ID '%s'", ret); - g_string_free (msg, TRUE); - g_string_free (devid, TRUE); - - return ret; + ret = g_checksum_get_string (sum); + mm_obj_dbg (log_object, "device identifier built: %s -> %s", msg->str, ret); + return g_strdup (ret); } /*****************************************************************************/ diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 9c1be81f..f22b880c 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -59,8 +59,9 @@ GArray *mm_parse_uint_list (const gchar *str, guint mm_count_bits_set (gulong number); guint mm_find_bit_set (gulong number); -gchar *mm_create_device_identifier (guint vid, - guint pid, +gchar *mm_create_device_identifier (guint vid, + guint pid, + gpointer log_object, const gchar *ati, const gchar *ati1, const gchar *gsn, diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index 551603df..33f53b9e 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -1911,6 +1911,7 @@ test_devid_item (void *f, gpointer d) g_debug ("%s... ", item->desc); devid = mm_create_device_identifier (item->vid, item->pid, + NULL, item->ati, item->ati1, item->gsn, |