libmbim-glib,message: remove obsolete read_string_tlv() method

The logic now uses the read_tlv_string() method, using the new TLV
types.

2 files changed, 0 insertions, 78 deletions

diff --git a/src/libmbim-glib/mbim-message-private.h b/src/libmbim-glib/mbim-message-private.h
index 2a27c16..80db730 100644
--- a/src/libmbim-glib/mbim-message-private.h
+++ b/src/libmbim-glib/mbim-message-private.h
@@ -324,12 +324,6 @@ gboolean _mbim_message_read_ipv6_array    (const MbimMessage  *self,
                                            guint32             relative_offset_array_start,
                                            MbimIPv6          **array,
                                            GError            **error);
-gboolean _mbim_message_read_string_tlv    (const MbimMessage  *self,
-                                           guint32             struct_start_offset,
-                                           guint32             relative_offset,
-                                           gchar             **str,
-                                           guint32            *tpv_size,
-                                           GError            **error);
 gboolean _mbim_message_read_tlv           (const MbimMessage  *self,
                                            guint32             relative_offset,
                                            MbimTlv           **tlv,
diff --git a/src/libmbim-glib/mbim-message.c b/src/libmbim-glib/mbim-message.c
index 27f9c35..8dbbd06 100644
--- a/src/libmbim-glib/mbim-message.c
+++ b/src/libmbim-glib/mbim-message.c
@@ -375,78 +375,6 @@ _mbim_message_read_string (const MbimMessage  *self,
 }
 
 gboolean
-_mbim_message_read_string_tlv (const MbimMessage  *self,
-                               guint32             struct_start_offset,
-                               guint32             relative_offset,
-                               gchar             **str,
-                               guint32            *tpv_size,
-                               GError            **error)
-{
-    guint32 required_size;
-    guint32 size = 0;
-    guint32 information_buffer_offset;
-    gunichar2 *utf16d = NULL;
-    const gunichar2 *utf16 = NULL;
-
-    information_buffer_offset = _mbim_message_get_information_buffer_offset (self);
-    required_size = information_buffer_offset + relative_offset;
-
-    if (self->len < required_size) {
-        g_set_error (error, MBIM_CORE_ERROR, MBIM_CORE_ERROR_INVALID_MESSAGE,
-                     "cannot read string offset and size (%u < %u)",
-                     self->len, required_size);
-        return FALSE;
-    }
-
-    size = GUINT32_FROM_LE (G_STRUCT_MEMBER (
-                                guint32,
-                                self->data,
-                                (information_buffer_offset + relative_offset)));
-
-    if (!size) {
-        *str = NULL;
-        *tpv_size = 4;
-        return TRUE;
-    } else {
-        *tpv_size = size+4;
-    }
-    required_size = information_buffer_offset + struct_start_offset + size;
-
-    if (self->len < required_size) {
-        g_set_error (error, MBIM_CORE_ERROR, MBIM_CORE_ERROR_INVALID_MESSAGE,
-                     "cannot read string data (%u bytes) (%u < %u)",
-                     size, self->len, required_size);
-        return FALSE;
-    }
-
-    utf16 = (const gunichar2 *) G_STRUCT_MEMBER_P (self->data, (information_buffer_offset + relative_offset+4 ));
-
-    /* For BE systems, convert from LE to BE */
-    if (G_BYTE_ORDER == G_BIG_ENDIAN) {
-        guint i;
-
-        utf16d = (gunichar2 *) g_malloc (size);
-        for (i = 0; i < (size / 2); i++)
-            utf16d[i] = GUINT16_FROM_LE (utf16[i]);
-    }
-
-    *str = g_utf16_to_utf8 (utf16d ? utf16d : utf16,
-                            size / 2,
-                            NULL,
-                            NULL,
-                            error);
-
-    g_free (utf16d);
-
-    if (!(*str)) {
-        g_prefix_error (error, "Error converting string to UTF-8: ");
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-gboolean
 _mbim_message_read_string_array (const MbimMessage   *self,
                                  guint32              array_size,
                                  guint32              struct_start_offset,