diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-charsets.c | 24 | ||||
| -rw-r--r-- | src/tests/test-charsets.c | 20 |
2 files changed, 8 insertions, 36 deletions
diff --git a/src/mm-charsets.c b/src/mm-charsets.c index e48cec3e..bf0de2b2 100644 --- a/src/mm-charsets.c +++ b/src/mm-charsets.c @@ -458,8 +458,7 @@ mm_charset_gsm_unpacked_to_utf8 (const guint8 *gsm, guint32 len) g_byte_array_append (utf8, (guint8 *) "?", 1); } - /* Always make sure returned string is NUL terminated */ - g_byte_array_append (utf8, (guint8 *) "\0", 1); + g_byte_array_append (utf8, (guint8 *) "\0", 1); /* NULL terminator */ return g_byte_array_free (utf8, FALSE); } @@ -472,6 +471,7 @@ mm_charset_utf8_to_unpacked_gsm (const char *utf8, guint32 *out_len) int i = 0; g_return_val_if_fail (utf8 != NULL, NULL); + g_return_val_if_fail (out_len != NULL, NULL); g_return_val_if_fail (g_utf8_validate (utf8, -1, NULL), NULL); /* worst case initial length */ @@ -480,8 +480,7 @@ mm_charset_utf8_to_unpacked_gsm (const char *utf8, guint32 *out_len) if (*utf8 == 0x00) { /* Zero-length string */ g_byte_array_append (gsm, (guint8 *) "\0", 1); - if (out_len) - *out_len = 0; + *out_len = 0; return g_byte_array_free (gsm, FALSE); } @@ -502,12 +501,7 @@ mm_charset_utf8_to_unpacked_gsm (const char *utf8, guint32 *out_len) i++; } - /* Output length doesn't consider terminating NUL byte */ - if (out_len) - *out_len = gsm->len; - - /* Always make sure returned string is NUL terminated */ - g_byte_array_append (gsm, (guint8 *) "\0", 1); + *out_len = gsm->len; return g_byte_array_free (gsm, FALSE); } @@ -763,10 +757,6 @@ mm_charset_take_and_convert_to_utf8 (gchar *str, MMModemCharset charset) break; case MM_MODEM_CHARSET_GSM: - utf8 = (gchar *) mm_charset_gsm_unpacked_to_utf8 ((const guint8 *) str, strlen (str)); - g_free (str); - break; - case MM_MODEM_CHARSET_8859_1: case MM_MODEM_CHARSET_PCCP437: case MM_MODEM_CHARSET_PCDN: { @@ -887,14 +877,12 @@ mm_utf8_take_and_convert_to_charset (gchar *str, break; case MM_MODEM_CHARSET_HEX: + /* FIXME: What encoding is this? */ + g_warn_if_reached (); encoded = str; break; case MM_MODEM_CHARSET_GSM: - encoded = (gchar *) mm_charset_utf8_to_unpacked_gsm (str, NULL); - g_free (str); - break; - case MM_MODEM_CHARSET_8859_1: case MM_MODEM_CHARSET_PCCP437: case MM_MODEM_CHARSET_PCDN: { diff --git a/src/tests/test-charsets.c b/src/tests/test-charsets.c index 0931d7e8..5c9e1875 100644 --- a/src/tests/test-charsets.c +++ b/src/tests/test-charsets.c @@ -316,15 +316,13 @@ test_gsm7_pack_7_chars_offset (void) static void test_take_convert_ucs2_hex_utf8 (void) { - gchar *src, *converted, *utf8; + gchar *src, *converted; /* Ensure hex-encoded UCS-2 works */ src = g_strdup ("0054002d004d006f00620069006c0065"); converted = mm_charset_take_and_convert_to_utf8 (src, MM_MODEM_CHARSET_UCS2); g_assert_cmpstr (converted, ==, "T-Mobile"); - utf8 = mm_utf8_take_and_convert_to_charset (converted, MM_MODEM_CHARSET_UCS2); - g_assert_cmpstr (utf8, ==, "0054002D004D006F00620069006C0065"); - g_free (utf8); + g_free (converted); } static void @@ -350,19 +348,6 @@ test_take_convert_ucs2_bad_ascii2 (void) g_assert (converted == NULL); } -static void -test_take_convert_gsm_utf8 (void) -{ - gchar *src, *converted, *utf8; - - src = g_strdup ("T-Mobile"); - converted = mm_charset_take_and_convert_to_utf8 (src, MM_MODEM_CHARSET_GSM); - g_assert_cmpstr (converted, ==, "T-Mobile"); - utf8 = mm_utf8_take_and_convert_to_charset (converted, MM_MODEM_CHARSET_GSM); - g_assert_cmpstr (utf8, ==, "T-Mobile"); - g_free (utf8); -} - struct charset_can_convert_to_test_s { const char *utf8; gboolean to_gsm; @@ -445,7 +430,6 @@ int main (int argc, char **argv) g_test_add_func ("/MM/charsets/take-convert/ucs2/hex", test_take_convert_ucs2_hex_utf8); g_test_add_func ("/MM/charsets/take-convert/ucs2/bad-ascii", test_take_convert_ucs2_bad_ascii); g_test_add_func ("/MM/charsets/take-convert/ucs2/bad-ascii-2", test_take_convert_ucs2_bad_ascii2); - g_test_add_func ("/MM/charsets/take-convert/gsm", test_take_convert_gsm_utf8); g_test_add_func ("/MM/charsets/can-convert-to", test_charset_can_covert_to); |