colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

charsets: remove charset_hex_to_utf8()

Browse Source 
No longer used, replaced by the new common conversion methods.
This commit is contained in:
Aleksander Morgado
2021-02-14 09:14:21 +01:00
parent 0ff3eb7ee0
commit c84454c1b0
2 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mm-charsets.c
View File

@@ -87,47 +87,6 @@ mm_modem_charset_to_string (MMModemCharset charset)
return settings ? settings->gsm_name : NULL; return settings ? settings->gsm_name : NULL;
} }
static const gchar *
charset_iconv_from (MMModemCharset charset)
{
const CharsetSettings *settings;
settings = lookup_charset_settings (charset);
return settings ? settings->iconv_name : NULL;
}
gchar *
mm_modem_charset_hex_to_utf8 (const gchar *src,
MMModemCharset charset)
{
const gchar *iconv_from;
g_autofree guint8 *unconverted = NULL;
g_autofree gchar *converted = NULL;
g_autoptr(GError) error = NULL;
gsize unconverted_len = 0;
g_return_val_if_fail (src != NULL, NULL);
g_return_val_if_fail (charset != MM_MODEM_CHARSET_UNKNOWN, NULL);
iconv_from = charset_iconv_from (charset);
g_return_val_if_fail (iconv_from != NULL, FALSE);
unconverted = mm_utils_hexstr2bin (src, -1, &unconverted_len, NULL);
if (!unconverted)
return NULL;
if (charset == MM_MODEM_CHARSET_UTF8 || charset == MM_MODEM_CHARSET_IRA)
return g_steal_pointer (&unconverted);
converted = g_convert ((const gchar *)unconverted, unconverted_len,
"UTF-8", iconv_from,
NULL, NULL, &error);
if (!converted || error)
return NULL;
return g_steal_pointer (&converted);
}
/******************************************************************************/ /******************************************************************************/
/* GSM 03.38 encoding conversion stuff */ /* GSM 03.38 encoding conversion stuff */

6
src/mm-charsets.h
View File

@@ -37,12 +37,6 @@ MMModemCharset mm_modem_charset_from_string (const gchar *string);
/*****************************************************************************************/ /*****************************************************************************************/
/* Take a string in hex representation ("00430052" or "A4BE11" for example)
* and convert it from the given character set to UTF-8.
*/
gchar *mm_modem_charset_hex_to_utf8 (const gchar *src,
MMModemCharset charset);
/* Checks whether conversion to the given charset may be done without errors */ /* Checks whether conversion to the given charset may be done without errors */
gboolean mm_charset_can_convert_to (const gchar *utf8, gboolean mm_charset_can_convert_to (const gchar *utf8,
MMModemCharset charset); MMModemCharset charset);