diff options
Diffstat (limited to 'src/data/mediadata.c')
-rw-r--r-- | src/data/mediadata.c | 74 |
1 files changed, 8 insertions, 66 deletions
diff --git a/src/data/mediadata.c b/src/data/mediadata.c index 50d4ac1..eac8507 100644 --- a/src/data/mediadata.c +++ b/src/data/mediadata.c @@ -18,9 +18,9 @@ #include <media_content.h> #include <app_debug.h> #include <app_media.h> -#include <utils_i18n.h> #include "data/datamgr.h" +#include "util/util.h" #define STR_IMAGE_NAME "Photo" #define STR_VIDEO_NAME "Video" @@ -142,64 +142,6 @@ static char *_get_date_string(struct tm *tm) return strdup(buf); } -static i18n_uchar* _convert_to_UTF16_string(const char *source_string) -{ - int buffer_length = 0; - i18n_error_code_e error_from_i18n; - i18n_uchar *converted_string = NULL; - - /* Calc buffer size for converted UTF16 string */ - i18n_ustring_from_UTF8(NULL, 0, &buffer_length, source_string, -1, &error_from_i18n); - - converted_string = malloc((buffer_length + 2) * sizeof(i18n_uchar)); - if (converted_string == NULL) { - _ERR("malloc failed"); - goto OUT; - } - - /* Convert to i18n(UTF16) string */ - i18n_ustring_from_UTF8(converted_string, buffer_length + 1, &buffer_length, source_string, -1, &error_from_i18n); - if (error_from_i18n != I18N_ERROR_NONE) { - _ERR("i18n_ustring_from_UTF8 returns [%d]", error_from_i18n); - free(converted_string); - goto OUT; - } - converted_string[buffer_length] = (i18n_uchar)0; - -OUT: - - return converted_string; -} - -static char* _convert_to_UTF8_string(i18n_uchar *sourct_string) -{ - int buffer_length = 0; - i18n_error_code_e error_from_i18n; - char *converted_string = NULL; - - i18n_ustring_to_UTF8(NULL, 0, &buffer_length, sourct_string, -1, &error_from_i18n); - - converted_string = malloc((buffer_length + 2) * sizeof(char)); - if (converted_string == NULL) { - _ERR("malloc failed"); - goto OUT; - } - - /* Convert to UTF8 */ - i18n_ustring_to_UTF8(converted_string, buffer_length + 1, &buffer_length, sourct_string, -1, &error_from_i18n); - if (error_from_i18n != I18N_ERROR_NONE) { - _ERR("i18n_ustring_to_UTF8 returns [%d]", error_from_i18n); - free(converted_string); - converted_string = NULL; - goto OUT; - } - converted_string[buffer_length] = '\0'; - -OUT: - - return converted_string; -} - static int _compare_title(struct group_info *gi, app_media_info *info) { if (!gi->data || !info->title) @@ -209,8 +151,8 @@ static int _compare_title(struct group_info *gi, app_media_info *info) i18n_uchar *converted_group_name = NULL; i18n_uchar *converted_media_title = NULL; - converted_group_name = _convert_to_UTF16_string(gi->data); - converted_media_title = _convert_to_UTF16_string(info->title); + converted_group_name = util_convert_to_UTF16_string(gi->data); + converted_media_title = util_convert_to_UTF16_string(info->title); if (converted_group_name && converted_media_title) { result = i18n_ustring_case_compare_n(converted_group_name, converted_media_title, 1, I18N_USTRING_U_FOLD_CASE_DEFAULT); @@ -235,13 +177,13 @@ static void *_get_data_title(app_media_info *info) char *result_str = NULL; i18n_uchar *converted_string = NULL; - converted_string = _convert_to_UTF16_string(info->title); + converted_string = util_convert_to_UTF16_string(info->title); if (converted_string == NULL) { _ERR("_convert_to_UTF16_string failed"); goto OUT; } - result_str = _convert_to_UTF8_string(converted_string); + result_str = util_convert_to_UTF8_string(converted_string); OUT: if (converted_string) @@ -259,17 +201,17 @@ static char *_get_title(app_media_info *info) i18n_uchar *converted_string = NULL; i18n_uchar sub_string[10] = { 0, }; - converted_string = _convert_to_UTF16_string(info->title); + converted_string = util_convert_to_UTF16_string(info->title); if (converted_string == NULL) { - _ERR("_convert_to_UTF16_string failed"); + _ERR("util_convert_to_UTF16_string failed"); goto OUT; } /* Get a character (not a byte) from left */ i18n_ustring_copy_n(sub_string, converted_string, 1); - result_str = _convert_to_UTF8_string(sub_string); + result_str = util_convert_to_UTF8_string(sub_string); OUT: |