function in mm_file_util_string cleanup 80/232380/2 submit/tizen/20200506.061601
authorMinje Ahn <minje.ahn@samsung.com>
Mon, 4 May 2020 01:44:10 +0000 (10:44 +0900)
committerMinje Ahn <minje.ahn@samsung.com>
Mon, 4 May 2020 01:45:57 +0000 (10:45 +0900)
Change-Id: I2e9fe3ad4113dec5feb2ec98f56157c8b8db0a25
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
12 files changed:
formats/ffmpeg/mm_file_format_aac.c
formats/ffmpeg/mm_file_format_ffmpeg.c
formats/ffmpeg/mm_file_format_frame.c
formats/ffmpeg/mm_file_format_imelody.c
formats/ffmpeg/mm_file_format_midi.c
formats/ffmpeg/mm_file_format_mp3.c
formats/ffmpeg/mm_file_formats.c
utils/include/mm_file_utils.h
utils/mm_file_util_io.c
utils/mm_file_util_io_mem.c
utils/mm_file_util_string.c
utils/mm_file_util_tag.c

index e9f6a0280342f10f2eaa3f0f71fff0db5f8d7ca9..5b03950a06193959d149a8c0e2d70e614268cfb3 100644 (file)
@@ -836,21 +836,21 @@ int mmfile_format_read_tag_aac(MMFileFormatContext *formatContext)
                goto exception;
        }
 
-       formatContext->title = mmfile_strdup(aacinfo.title);
-       formatContext->author = mmfile_strdup(aacinfo.author);
-       formatContext->artist = mmfile_strdup(aacinfo.artist);
-       formatContext->album = mmfile_strdup(aacinfo.album);
-       formatContext->album_artist = mmfile_strdup(aacinfo.album_artist);
-       formatContext->year = mmfile_strdup(aacinfo.year);
-       formatContext->copyright = mmfile_strdup(aacinfo.copyright);
-       formatContext->comment = mmfile_strdup(aacinfo.comment);
-       formatContext->genre = mmfile_strdup(aacinfo.genre);
-       formatContext->tagTrackNum = mmfile_strdup(aacinfo.tracknum);
-       formatContext->composer = mmfile_strdup(aacinfo.composer);
-       formatContext->classification = mmfile_strdup(aacinfo.classification);
-       formatContext->rating = mmfile_strdup(aacinfo.rating);  /*not exist rating tag in id3*/
-       formatContext->conductor = mmfile_strdup(aacinfo.conductor);
-       formatContext->artworkMime = mmfile_strdup(aacinfo.artworkMime);
+       formatContext->title = g_strdup(aacinfo.title);
+       formatContext->author = g_strdup(aacinfo.author);
+       formatContext->artist = g_strdup(aacinfo.artist);
+       formatContext->album = g_strdup(aacinfo.album);
+       formatContext->album_artist = g_strdup(aacinfo.album_artist);
+       formatContext->year = g_strdup(aacinfo.year);
+       formatContext->copyright = g_strdup(aacinfo.copyright);
+       formatContext->comment = g_strdup(aacinfo.comment);
+       formatContext->genre = g_strdup(aacinfo.genre);
+       formatContext->tagTrackNum = g_strdup(aacinfo.tracknum);
+       formatContext->composer = g_strdup(aacinfo.composer);
+       formatContext->classification = g_strdup(aacinfo.classification);
+       formatContext->rating = g_strdup(aacinfo.rating);       /*not exist rating tag in id3*/
+       formatContext->conductor = g_strdup(aacinfo.conductor);
+       formatContext->artworkMime = g_strdup(aacinfo.artworkMime);
        if (aacinfo.artwork) {
                formatContext->artworkSize = aacinfo.artworkSize;
                formatContext->artwork = mmfile_malloc(aacinfo.artworkSize);
index 75552f08025682f342921f77bf600b8f3f334acd..24cbdd84c6c90b655b031aff386446805d18ff8e 100644 (file)
@@ -99,11 +99,8 @@ static int _mmf_mem_open(MMFmemIOHandle **handle, const char *filename)
 
        filename += strlen(MMFILE_MEM_URI);
 
-       splitedString = mmfile_strsplit(filename, ":");
-       if (splitedString == NULL) {
-               debug_error(DEBUG, "invalid param\n");
-               return MMFILE_IO_FAILED;
-       }
+       splitedString = g_strsplit(filename, ":", -1);
+       mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_IO_FAILED);
 
        if (!splitedString[0] || !splitedString[1]) {
                debug_error(DEBUG, "invalid param\n");
@@ -123,17 +120,12 @@ static int _mmf_mem_open(MMFmemIOHandle **handle, const char *filename)
 
        *handle = memHandle;
 
-       if (splitedString) {
-               mmfile_strfreev(splitedString);
-       }
+       g_strfreev(splitedString);
 
        return MMFILE_IO_SUCCESS;
 
 exception:
-
-       if (splitedString) {
-               mmfile_strfreev(splitedString);
-       }
+       g_strfreev(splitedString);
 
        return MMFILE_IO_FAILED;
 }
@@ -617,11 +609,11 @@ static void __fill_artwork_in_context(AVStream *st, MMFileFormatContext *formatC
        mmfile_free(formatContext->artworkMime);
 
        if (codec_id == AV_CODEC_ID_MJPEG)
-               formatContext->artworkMime = mmfile_strdup("image/jpeg");
+               formatContext->artworkMime = g_strdup("image/jpeg");
        else if (codec_id == AV_CODEC_ID_PNG)
-               formatContext->artworkMime = mmfile_strdup("image/png");
+               formatContext->artworkMime = g_strdup("image/png");
        else if (codec_id == AV_CODEC_ID_BMP)
-               formatContext->artworkMime = mmfile_strdup("image/bmp");
+               formatContext->artworkMime = g_strdup("image/bmp");
        else
                debug_error(DEBUG, "Unknown cover type: 0x%x\n", codec_id);
 
@@ -645,46 +637,46 @@ static void __fill_metainfo_in_context(AVDictionary *metainfo, MMFileFormatConte
 
                if (!g_ascii_strcasecmp(tag->key, "title")) {
                        MMFILE_SAFE_FREE(formatContext->title);
-                       formatContext->title = mmfile_strdup(tag->value);
+                       formatContext->title = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "artist")) {
                        MMFILE_SAFE_FREE(formatContext->artist);
-                       formatContext->artist = mmfile_strdup(tag->value);
+                       formatContext->artist = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "composer")) {
                        MMFILE_SAFE_FREE(formatContext->composer);
-                       formatContext->composer = mmfile_strdup(tag->value);
+                       formatContext->composer = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "album")) {
                        MMFILE_SAFE_FREE(formatContext->album);
-                       formatContext->album = mmfile_strdup(tag->value);
+                       formatContext->album = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "album_artist")) {
                        MMFILE_SAFE_FREE(formatContext->album_artist);
-                       formatContext->album_artist = mmfile_strdup(tag->value);
+                       formatContext->album_artist = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "copyright")) {
                        MMFILE_SAFE_FREE(formatContext->copyright);
-                       formatContext->copyright = mmfile_strdup(tag->value);
+                       formatContext->copyright = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "comment")) {
                        MMFILE_SAFE_FREE(formatContext->comment);
-                       formatContext->comment = mmfile_strdup(tag->value);
+                       formatContext->comment = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "description")) {
                        MMFILE_SAFE_FREE(formatContext->description);
-                       formatContext->description = mmfile_strdup(tag->value);
+                       formatContext->description = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "genre")) {
                        MMFILE_SAFE_FREE(formatContext->genre);
-                       formatContext->genre = mmfile_strdup(tag->value);
+                       formatContext->genre = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "date")) {
                        MMFILE_SAFE_FREE(formatContext->year);
-                       formatContext->year = mmfile_strdup(tag->value);
+                       formatContext->year = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "creation_time")) {
                        MMFILE_SAFE_FREE(formatContext->recDate);
-                       formatContext->recDate = mmfile_strdup(tag->value);
+                       formatContext->recDate = g_strdup(tag->value);
                } else if ((!g_ascii_strcasecmp(tag->key, "track")) || (!g_ascii_strcasecmp(tag->key, "tracknumber"))) {
                        MMFILE_SAFE_FREE(formatContext->tagTrackNum);
-                       formatContext->tagTrackNum = mmfile_strdup(tag->value);
+                       formatContext->tagTrackNum = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "lyrics")) {
                        MMFILE_SAFE_FREE(formatContext->unsyncLyrics);
-                       formatContext->unsyncLyrics = mmfile_strdup(tag->value);
+                       formatContext->unsyncLyrics = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "rotate")) {   /*can be "90", "180", "270" */
                        MMFILE_SAFE_FREE(formatContext->rotate);
-                       formatContext->rotate = mmfile_strdup(tag->value);
+                       formatContext->rotate = g_strdup(tag->value);
                } else if (!g_ascii_strcasecmp(tag->key, "spherical-video")) {
                        ParseSpatialVideoMetadataFromXMLString(tag->value, formatContext);
                } else if (!g_ascii_strcasecmp(tag->key, "metadata_block_picture")) {
index a0ae37b18a7dff668bd095c0e6302cf98da1a4b9..795d8ba64850a06c71712edbfabfa6fc3b6afd30 100755 (executable)
@@ -74,11 +74,8 @@ static int _mmf_mem_open(MMFmemIOHandle **handle, const char *filename)
 
        filename += strlen(MMFILE_MEM_URI);
 
-       splitedString = mmfile_strsplit(filename, ":");
-       if (splitedString == NULL) {
-               debug_error(DEBUG, "invalid param\n");
-               return MMFILE_IO_FAILED;
-       }
+       splitedString = g_strsplit(filename, ":", -1);
+       mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_IO_FAILED);
 
        if (!splitedString[0] || !splitedString[1]) {
                debug_error(DEBUG, "invalid param\n");
@@ -98,17 +95,12 @@ static int _mmf_mem_open(MMFmemIOHandle **handle, const char *filename)
 
        *handle = memHandle;
 
-       if (splitedString) {
-               mmfile_strfreev(splitedString);
-       }
+       g_strfreev(splitedString);
 
        return MMFILE_IO_SUCCESS;
 
 exception:
-
-       if (splitedString) {
-               mmfile_strfreev(splitedString);
-       }
+       g_strfreev(splitedString);
 
        return MMFILE_IO_FAILED;
 }
@@ -651,7 +643,6 @@ int mmfile_format_get_frame_from_memory(const void *data, unsigned int datasize,
        int format = -1;
        char mimeType[MMFILE_MIMETYPE_MAX_LEN] = {0, };
        char ffmpegFormatName[MMFILE_FILE_FMT_MAX_LEN] = {0, };
-       char tempURIBuffer[MMFILE_URI_MAX_LEN] = {0, };
        char *urifilename = NULL;
        AVFormatContext *pFormatCtx = NULL;
        AVInputFormat *grab_iformat = NULL;
@@ -665,12 +656,7 @@ int mmfile_format_get_frame_from_memory(const void *data, unsigned int datasize,
 
        av_register_all();
 
-       snprintf(tempURIBuffer, MMFILE_URI_MAX_LEN,  "%s%u:%u", MMFILE_MEM_URI, (unsigned int)data, datasize);
-       urifilename = mmfile_strdup(tempURIBuffer);
-       if (!urifilename) {
-               debug_error(DEBUG, "error: uri is NULL\n");
-               return MMFILE_FORMAT_FAIL;
-       }
+       urifilename = g_strdup_printf("%s%u:%u", MMFILE_MEM_URI, (unsigned int)data, datasize);
 
        mmfile_register_io_all();
 
index 77f50ec2e98598768249358ec1e880b75cd407a5..df9851d0cf70d677611f679b7c4b56640778d674 100755 (executable)
@@ -251,7 +251,7 @@ int mmfile_format_read_tag_imy(MMFileFormatContext *formatContext)
 
                if (formatContext->title == NULL) {
                        debug_warning(DEBUG, "failed to UTF8 convert.\n");
-                       formatContext->title = mmfile_strdup(taginfo.title);
+                       formatContext->title = g_strdup(taginfo.title);
                }
                mmfile_free(taginfo.title);
        }
@@ -267,7 +267,7 @@ int mmfile_format_read_tag_imy(MMFileFormatContext *formatContext)
                                                                                                (unsigned int *)&cnv_len);
                if (formatContext->composer == NULL) {
                        debug_warning(DEBUG, "failed to UTF8 convert.\n");
-                       formatContext->composer = mmfile_strdup(taginfo.composer);
+                       formatContext->composer = g_strdup(taginfo.composer);
                }
                mmfile_free(taginfo.composer);
        }
@@ -283,7 +283,7 @@ int mmfile_format_read_tag_imy(MMFileFormatContext *formatContext)
                                                                                                (unsigned int *)&cnv_len);
                if (formatContext->comment == NULL) {
                        debug_warning(DEBUG, "failed to UTF8 convert.\n");
-                       formatContext->comment = mmfile_strdup(taginfo.comment);
+                       formatContext->comment = g_strdup(taginfo.comment);
                }
                mmfile_free(taginfo.comment);
        }
@@ -299,7 +299,7 @@ int mmfile_format_read_tag_imy(MMFileFormatContext *formatContext)
                                                                                                (unsigned int *)&cnv_len);
                if (formatContext->copyright == NULL) {
                        debug_warning(DEBUG, "failed to UTF8 convert.\n");
-                       formatContext->copyright = mmfile_strdup(taginfo.copyright);
+                       formatContext->copyright = g_strdup(taginfo.copyright);
                }
                mmfile_free(taginfo.copyright);
        }
@@ -392,13 +392,13 @@ static int __get_imelody_tag(const char *uriname, tMMFileImelodyTagInfo *tags)
                        if (isDone) {
                                if (!strncmp(imy_key_buffer, "NAME", 4)) {
                                        mmfile_free(tags->title);
-                                       tags->title = mmfile_strdup(imy_value_buffer);
+                                       tags->title = g_strdup(imy_value_buffer);
                                } else if (!strncmp(imy_key_buffer, "COMPOSER", 8)) {
                                        mmfile_free(tags->composer);
-                                       tags->composer = mmfile_strdup(imy_value_buffer);
+                                       tags->composer = g_strdup(imy_value_buffer);
                                } else if (!strncmp(imy_key_buffer, "COPYRIGHT", 9)) {
                                        mmfile_free(tags->copyright);
-                                       tags->copyright = mmfile_strdup(imy_value_buffer);
+                                       tags->copyright = g_strdup(imy_value_buffer);
                                }
 
                                memset(imy_key_buffer, 0x00, _MMFILE_IMY_KEY_BUFFER_LENGTH);
index d8e228473e2bbc1ee4668f9773b014a7abe4fbf9..439161259e1338c5c1c2a061f3cc4b175aaa4064 100755 (executable)
@@ -366,7 +366,7 @@ int mmfile_format_read_tag_mid(MMFileFormatContext *formatContext)
                formatContext->title = mmfile_string_convert((const char *)info->title, tag_len, "UTF-8", locale, NULL, (unsigned int *)&cnv_len);
                if (formatContext->title == NULL) {
                        debug_warning(DEBUG, "failed to UTF8 convert.\n");
-                       formatContext->title = mmfile_strdup(info->title);
+                       formatContext->title = g_strdup(info->title);
                }
        }
 
@@ -376,7 +376,7 @@ int mmfile_format_read_tag_mid(MMFileFormatContext *formatContext)
                formatContext->copyright = mmfile_string_convert((const char *)info->copyright, tag_len, "UTF-8", locale, NULL, (unsigned int *)&cnv_len);
                if (formatContext->copyright == NULL) {
                        debug_warning(DEBUG, "failed to UTF8 convert.\n");
-                       formatContext->copyright = mmfile_strdup(info->copyright);
+                       formatContext->copyright = g_strdup(info->copyright);
                }
        }
 
@@ -386,7 +386,7 @@ int mmfile_format_read_tag_mid(MMFileFormatContext *formatContext)
                formatContext->comment = mmfile_string_convert((const char *)info->comment, tag_len, "UTF-8", locale, NULL, (unsigned int *)&cnv_len);
                if (formatContext->comment == NULL) {
                        debug_warning(DEBUG, "failed to UTF8 convert.\n");
-                       formatContext->comment = mmfile_strdup(info->comment);
+                       formatContext->comment = g_strdup(info->comment);
                }
        }
 
index 3e514b8aa491ea8187094422fe137e1defdd1f51..130c22aa6be083044eac11933aa310d9890132bc 100644 (file)
@@ -192,23 +192,23 @@ int mmfile_format_read_tag_mp3(MMFileFormatContext *formatContext)
 
        privateData = formatContext->privateFormatData;
 
-       formatContext->title = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_TITLE].value);
-       formatContext->artist = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_ARTIST].value);
-       formatContext->copyright = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_COPYRIGHT].value);
-       formatContext->comment = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_COMMENT].value);
-       formatContext->album = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_ALBUM].value);
-       formatContext->album_artist = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_ALBUM_ARTIST].value);
-       formatContext->year = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_YEAR].value);
-       formatContext->genre = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_GENRE].value);
-       formatContext->tagTrackNum = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_TRACKNUM].value);
-       formatContext->composer = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_COMPOSER].value);
-       formatContext->classification = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_CONTENT_GROUP].value);
-       formatContext->conductor = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_CONDUCTOR].value);
-       formatContext->unsyncLyrics = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_UNSYNCLYRICS].value);
+       formatContext->title = g_strdup(privateData->tagInfo[AV_ID3TAG_TITLE].value);
+       formatContext->artist = g_strdup(privateData->tagInfo[AV_ID3TAG_ARTIST].value);
+       formatContext->copyright = g_strdup(privateData->tagInfo[AV_ID3TAG_COPYRIGHT].value);
+       formatContext->comment = g_strdup(privateData->tagInfo[AV_ID3TAG_COMMENT].value);
+       formatContext->album = g_strdup(privateData->tagInfo[AV_ID3TAG_ALBUM].value);
+       formatContext->album_artist = g_strdup(privateData->tagInfo[AV_ID3TAG_ALBUM_ARTIST].value);
+       formatContext->year = g_strdup(privateData->tagInfo[AV_ID3TAG_YEAR].value);
+       formatContext->genre = g_strdup(privateData->tagInfo[AV_ID3TAG_GENRE].value);
+       formatContext->tagTrackNum = g_strdup(privateData->tagInfo[AV_ID3TAG_TRACKNUM].value);
+       formatContext->composer = g_strdup(privateData->tagInfo[AV_ID3TAG_COMPOSER].value);
+       formatContext->classification = g_strdup(privateData->tagInfo[AV_ID3TAG_CONTENT_GROUP].value);
+       formatContext->conductor = g_strdup(privateData->tagInfo[AV_ID3TAG_CONDUCTOR].value);
+       formatContext->unsyncLyrics = g_strdup(privateData->tagInfo[AV_ID3TAG_UNSYNCLYRICS].value);
        formatContext->syncLyrics = privateData->pSyncLyrics;
        formatContext->syncLyricsNum = privateData->tagInfo[AV_ID3TAG_SYNCLYRICS].length;
-       formatContext->recDate = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_RECDATE].value);
-       formatContext->part_of_set = mmfile_strdup(privateData->tagInfo[AV_ID3TAG_PART_OF_SET].value);
+       formatContext->recDate = g_strdup(privateData->tagInfo[AV_ID3TAG_RECDATE].value);
+       formatContext->part_of_set = g_strdup(privateData->tagInfo[AV_ID3TAG_PART_OF_SET].value);
 
        if (privateData->imageInfo.imageLen > 0) {
                formatContext->artwork = mmfile_malloc(privateData->imageInfo.imageLen);
@@ -216,10 +216,10 @@ int mmfile_format_read_tag_mp3(MMFileFormatContext *formatContext)
                        formatContext->artworkSize = privateData->imageInfo.imageLen;
                        memcpy(formatContext->artwork, privateData->imageInfo.pImageBuf, privateData->imageInfo.imageLen);
                        if (strlen(privateData->imageInfo.imageMIMEType) > 0)
-                               formatContext->artworkMime = mmfile_strdup(privateData->imageInfo.imageMIMEType);
+                               formatContext->artworkMime = g_strdup(privateData->imageInfo.imageMIMEType);
                        else if (strlen(privateData->imageInfo.imageExt) > 0) {
                                debug_msg(RELEASE, "ID3 tag V2 File");
-                               formatContext->artworkMime = mmfile_strdup(privateData->imageInfo.imageExt);
+                               formatContext->artworkMime = g_strdup(privateData->imageInfo.imageExt);
                        } else {
                                debug_error(DEBUG, "Album art image exist but there is no type information of album art\n");
                        }
index 6a4415f9a84be3c198d2d057a5eb391cd2060a05..e400eac0e207233544715b20a0123df027886d76 100755 (executable)
@@ -339,14 +339,7 @@ _PreprocessFile(MMFileSourceType *fileSrc, char **urifilename, int *formatEnum)
                        goto FILE_FORMAT_FAIL;
                }
        } else if (fileSrc->type == MM_FILE_SRC_TYPE_MEMORY) {
-               char tempURIBuffer[MMFILE_URI_MAX_LEN] = {0, };
-
-               snprintf(tempURIBuffer, MMFILE_URI_MAX_LEN, "%s%lu:%u", MMFILE_MEM_URI, (unsigned long)fileSrc->memory.ptr, fileSrc->memory.size);
-               *urifilename = mmfile_strdup(tempURIBuffer);
-               if (!*urifilename) {
-                       debug_error(DEBUG, "error: uri is NULL\n");
-                       goto FILE_FORMAT_FAIL;
-               }
+               *urifilename = g_strdup_printf("%s%lu:%u", MMFILE_MEM_URI, (unsigned long)fileSrc->memory.ptr, fileSrc->memory.size);
 
                ret = mmfile_open(&fp, *urifilename, MMFILE_RDONLY);
 
index 43dbe5507947f7bdc324100e120ccdd6036bf14a..a589e2fa8dbb8d682e31021dc3aa792c45eab1f1 100755 (executable)
@@ -176,14 +176,8 @@ void mmfile_format_print_frame(MMFileFormatFrame *in);
 /*////////////////////////////////////////////////////////////////////// */
 /*                            STRING API                              // */
 /*////////////////////////////////////////////////////////////////////// */
-char **mmfile_strsplit(const char *string, const char *delimiter);
-void mmfile_strfreev(char **str_array);
-int  mmfile_util_wstrlen(unsigned short *wText);
-short *mmfile_swap_2byte_string(short *mszOutput, short *mszInput, int length);
 char *mmfile_get_charset(const char *str);
 char *mmfile_string_convert(const char *str, unsigned int len, const char *to_codeset, const char *from_codeset, gsize *bytes_read, unsigned int *bytes_written);
-char *mmfile_strdup(const char *str);
-
 
 
 /*////////////////////////////////////////////////////////////////////// */
@@ -223,7 +217,6 @@ char *mmfile_string_convert_debug(const char *str, unsigned int len, const char
                                                                int *bytes_written,
                                                                const char *func,
                                                                unsigned int line);
-char *mmfile_strdup_debug(const char *str, const char *func, unsigned int line);
 
 #define mmfile_malloc(size)         mmfile_malloc_debug((size), __func__, __LINE__)
 #define mmfile_calloc(nmemb, size)         mmfile_calloc_debug((nmemb), (size), __func__, __LINE__)
@@ -233,7 +226,6 @@ char *mmfile_strdup_debug(const char *str, const char *func, unsigned int line);
 #define mmfile_memcpy(dest, src, n) mmfile_memcpy_debug((ptr), (src), (n), __func__, __LINE__)
 
 #define mmfile_string_convert(str, len, to_codeset, from_codeset, bytes_read, bytes_written) mmfile_string_convert_debug((str), (len), (to_codeset), (from_codeset), (bytes_read), (bytes_written), __func__, __LINE__)
-#define mmfile_strdup(x)   mmfile_strdup_debug((x), __func__, __LINE__)
 #else
 /*////////////////////////////////////////////////////////////////////// */
 /*                            MEMORY API                              // */
index 6510903cf9d1df8d7dcbff0717784d247e2d3996..b9cd6df132b049954fa61a9686bccee70fd9dbef 100644 (file)
@@ -120,12 +120,7 @@ static int _mmfile_open(MMFileIOHandle **handle, struct MMFileIOFunc *Func, cons
 
        debug_msg(RELEASE, "[%s]\n", filename);
 
-       pHandle->fileName = mmfile_strdup(filename);
-       if (!pHandle->fileName) {
-               debug_error(DEBUG, "mmfile_malloc: pHandle->fileName\n");
-               err = MMFILE_IO_FAILED;
-               goto fail;
-       }
+       pHandle->fileName = g_strdup(filename);
 
        err = Func->mmfile_open(pHandle, filename, flags);
        if (err < 0) {
index 5b5717ed101cfe68c51518854f5d658425920ab0..c72b01e74f139a4445bc864ee0d2197637fedb61 100755 (executable)
@@ -46,11 +46,8 @@ static int mmf_mem_open(MMFileIOHandle *handle, const char *filename, int flags)
 
        filename += strlen(handle->iofunc->handleName) + 3; /* ://%d:%d means (memory addr:mem size)*/
 
-       splitedString = mmfile_strsplit(filename, ":");
-       if (splitedString == NULL) {
-               debug_error(DEBUG, "invalid param\n");
-               return MMFILE_IO_FAILED;
-       }
+       splitedString = g_strsplit(filename, ":", -1);
+       mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_IO_FAILED);
 
        if (!splitedString[0] || !splitedString[1]) {
                debug_error(DEBUG, "invalid param\n");
@@ -70,21 +67,12 @@ static int mmf_mem_open(MMFileIOHandle *handle, const char *filename, int flags)
 
        handle->privateData = (void *) memHandle;
 
-       if (splitedString) {
-               mmfile_strfreev(splitedString);
-       }
+       g_strfreev(splitedString);
 
        return MMFILE_IO_SUCCESS;
 
 exception:
-
-       if (splitedString) {
-               mmfile_strfreev(splitedString);
-       }
-
-#if 0  /*dead code */
-       mmfile_free(memHandle);
-#endif
+       g_strfreev(splitedString);
 
        return MMFILE_IO_FAILED;
 }
index 96f549c7639af5787b6f46ceae116b57dbb7800f..a6710e7fd2b117ecaaf3843594122395c27d8c88 100755 (executable)
 #include "mm_file_utils.h"
 
 #ifdef __MMFILE_MEM_TRACE__
-short __WmLngSwapShort(short aShort)
-{
-       return ((aShort << 8) + (aShort >> 8));
-}
-
-EXPORT_API
-short *mmfile_swap_2byte_string(short *mszOutput, short *mszInput, int length)
-{
-       int     i;
-
-       for (i = 0; i < length; i++) {
-               if (mszInput[i] == 0)
-                       break;
-
-               mszOutput[i] = __WmLngSwapShort(mszInput[i]);
-       }
-
-       mszOutput[i] = 0;
-
-       return mszOutput;
-}
-
-
 EXPORT_API
 char *mmfile_string_convert_debug(const char *str, unsigned int len,
                                                                const char *to_codeset, const char *from_codeset,
@@ -69,24 +46,6 @@ char *mmfile_string_convert_debug(const char *str, unsigned int len,
 
 }
 
-EXPORT_API
-char *mmfile_strdup_debug(const char *str, const char *func, unsigned int line)
-{
-       char *temp = NULL;
-
-       if (!str)
-               return NULL;
-
-       temp = strdup(str);
-
-       if (temp) {
-               debug_msg(RELEASE, "## DEBUG ## %p = strdup (%p) by %s() %d\n", temp, str, func, line);
-       }
-
-       return temp;
-}
-
-
 #else   /* __MMFILE_MEM_TRACE__ */
 
 EXPORT_API
@@ -160,10 +119,7 @@ char *mmfile_string_convert(const char *str, unsigned int len,
        /*if both to_codeset and from_codeset are same, return duplicated string.*/
        if (g_strcmp0(to_codeset, from_codeset) == 0) {
                result = g_strdup(str);
-               if (!result) {
-                       debug_error(DEBUG, "g_strdup return null");
-                       return NULL;
-               }
+
                if (bytes_written != NULL)
                        *bytes_written = strlen(result);
 
@@ -200,44 +156,4 @@ char *mmfile_string_convert(const char *str, unsigned int len,
        return result;
 }
 
-EXPORT_API
-char *mmfile_strdup(const char *str)
-{
-       if (!str)
-               return NULL;
-
-       return strdup(str);
-}
-
 #endif  /*__MMFILE_MEM_TRACE__*/
-
-EXPORT_API
-int  mmfile_util_wstrlen(unsigned short *wText)
-{
-       int n = 0;
-
-       if (NULL == wText) {
-               debug_error(DEBUG, "wText is NULL\n");
-               return MMFILE_UTIL_FAIL;
-       }
-
-       n = 0;
-
-       while (*(wText + n) != 0) {
-               n++;
-       }
-
-       return n;
-}
-
-EXPORT_API
-char **mmfile_strsplit(const char *string, const char *delimiter)
-{
-       return g_strsplit(string, delimiter, -1);
-}
-
-EXPORT_API
-void mmfile_strfreev(char **str_array)
-{
-       g_strfreev(str_array);
-}
index 9d11dd97725760d68d544adc1ac6b58303a4d5b5..22df22cfe1e0d7fb4b69a43e528865366869cd2f 100644 (file)
@@ -341,7 +341,7 @@ static int GetStringFromTextTagBox(MMFileFormatContext *formatContext, MMFileIOH
                unsigned int bytes_written = 0;
                temp_text = mmfile_string_convert((const char *)&texttag.text[2], readed - 2, "UTF-8", "UTF-16", NULL, (unsigned int *)&bytes_written);
        } else {
-               temp_text = mmfile_strdup((const char *)texttag.text);
+               temp_text = g_strdup((const char *)texttag.text);
        }
 
        switch (eTag) {
@@ -424,7 +424,7 @@ static int GetYearFromYearTagBox(MMFileFormatContext *formatContext, MMFileIOHan
                yearbox.year = mmfile_io_be_int16(yearbox.year);
                snprintf(temp_year, MAX_YEAR_BUFFER, "%d", yearbox.year);
                temp_year[MAX_YEAR_BUFFER - 1] = '\0';
-               formatContext->year = mmfile_strdup((const char *)temp_year);
+               formatContext->year = g_strdup((const char *)temp_year);
        }
 
        mmfile_seek(fp, basic_header->start_offset + basic_header->size, SEEK_SET);
@@ -489,7 +489,7 @@ static int GetAlbumFromAlbumTagBox(MMFileFormatContext *formatContext, MMFileIOH
                        unsigned int bytes_written = 0;
                        temp_text = mmfile_string_convert((const char *)&albumbox.albumtile[2], readed - 2, "UTF-8", "UTF-16", NULL, (unsigned int *)&bytes_written);
                } else {
-                       temp_text = mmfile_strdup((const char *)albumbox.albumtile);
+                       temp_text = g_strdup((const char *)albumbox.albumtile);
                }
 
                if (!formatContext->album)
@@ -511,7 +511,7 @@ static int GetAlbumFromAlbumTagBox(MMFileFormatContext *formatContext, MMFileIOH
                        char tracknum[10] = {0, };
                        snprintf(tracknum, 10, "%d", albumbox.trackNumber);
                        tracknum[9] = '\0';
-                       formatContext->tagTrackNum = mmfile_strdup((const char *)tracknum);
+                       formatContext->tagTrackNum = g_strdup((const char *)tracknum);
                }
        }
 
@@ -571,7 +571,7 @@ static int GetRatingFromRatingTagBox(MMFileFormatContext *formatContext, MMFileI
                unsigned int bytes_written = 0;
                temp_text = mmfile_string_convert((const char *)&ratingTag.ratingInfo[2], readed - 2, "UTF-8", "UTF-16", NULL, (unsigned int *)&bytes_written);
        } else {
-               temp_text = mmfile_strdup((const char *)ratingTag.ratingInfo);
+               temp_text = g_strdup((const char *)ratingTag.ratingInfo);
        }
 
        if (!formatContext->rating) {
@@ -636,7 +636,7 @@ static int GetClassficationFromClsfTagBox(MMFileFormatContext *formatContext, MM
                unsigned int bytes_written = 0;
                temp_text = mmfile_string_convert((const char *)&classTag.classificationInfo[2], readed - 2, "UTF-8", "UTF-16", NULL, (unsigned int *)&bytes_written);
        } else {
-               temp_text = mmfile_strdup((const char *)classTag.classificationInfo);
+               temp_text = g_strdup((const char *)classTag.classificationInfo);
        }
 
        if (!formatContext->classification) {
@@ -744,7 +744,7 @@ static int GetLocationFromLociTagBox(MMFileFormatContext *formatContext, MMFileI
                if (p[0] == 0xFE && p[1] == 0xFF) {
                        lociTag.name = (unsigned char *)mmfile_string_convert((const char *)(p + 2), pos - 2, "UTF-8", "UTF-16", NULL, (unsigned int *)&bytes_written);
                } else {
-                       lociTag.name = (unsigned char *)mmfile_strdup((const char *)p);
+                       lociTag.name = (unsigned char *)g_strdup((const char *)p);
                }
        } else {
                goto exception;
@@ -783,7 +783,7 @@ static int GetLocationFromLociTagBox(MMFileFormatContext *formatContext, MMFileI
                if (p[0] == 0xFE && p[1] == 0xFF) {
                        lociTag.astronomical_body = (unsigned char *)mmfile_string_convert((const char *)(p + 2), pos - 2, "UTF-8", "UTF-16", NULL, (unsigned int *)&bytes_written);
                } else {
-                       lociTag.astronomical_body = (unsigned char *)mmfile_strdup((const char *)p);
+                       lociTag.astronomical_body = (unsigned char *)g_strdup((const char *)p);
                }
        } else {
                goto exception;
@@ -797,7 +797,7 @@ static int GetLocationFromLociTagBox(MMFileFormatContext *formatContext, MMFileI
                if (p[0] == 0xFE && p[1] == 0xFF) {
                        lociTag.additional_notes = (unsigned char *)mmfile_string_convert((const char *)(p + 2), pos - 2, "UTF-8", "UTF-16", NULL, (unsigned int *)&bytes_written);
                } else {
-                       lociTag.additional_notes = (unsigned char *)mmfile_strdup((const char *)p);
+                       lociTag.additional_notes = (unsigned char *)g_strdup((const char *)p);
                }
        } else {
                goto exception;
@@ -1603,7 +1603,7 @@ static int GetTagFromMetaBox(MMFileFormatContext *formatContext, MMFileIOHandle
                                if (!formatContext->tagTrackNum) {
                                        memset(read_buf, 0x00, _ITUNES_READ_BUF_SZ);
                                        snprintf((char *)read_buf, sizeof(read_buf), "%d", track_num);
-                                       formatContext->tagTrackNum = mmfile_strdup((const char *)read_buf);
+                                       formatContext->tagTrackNum = g_strdup((const char *)read_buf);
                                }
                        }
                }
@@ -1622,7 +1622,7 @@ static int GetTagFromMetaBox(MMFileFormatContext *formatContext, MMFileIOHandle
                                                memset(read_buf, 0x00, _ITUNES_READ_BUF_SZ);
                                                snprintf((char *)read_buf, sizeof(read_buf), "%s", MpegAudio_Genre[genre_index - 1]);
                                                debug_msg(RELEASE, "genre string=[%s] \n", read_buf);
-                                               formatContext->genre = mmfile_strdup((const char *)read_buf);
+                                               formatContext->genre = g_strdup((const char *)read_buf);
                                        }
                                }
                        }
@@ -1649,14 +1649,14 @@ static int GetTagFromMetaBox(MMFileFormatContext *formatContext, MMFileIOHandle
                                formatContext->artwork = mmfile_malloc(cover_sz);
                                formatContext->artworkSize = cover_sz;
                                if (cover_type == _ITUNES_COVER_TYPE_JPEG) {
-                                       formatContext->artworkMime = mmfile_strdup("image/jpeg");
+                                       formatContext->artworkMime = g_strdup("image/jpeg");
                                } else if (cover_type == _ITUNES_COVER_TYPE_PNG) {
-                                       formatContext->artworkMime = mmfile_strdup("image/png");
+                                       formatContext->artworkMime = g_strdup("image/png");
                                        /*} else if (cover_type == _ITUNES_COVER_TYPE_TIF) {
-                                               formatContext->artworkMime = mmfile_strdup("image/tif");*/
+                                               formatContext->artworkMime = g_strdup("image/tif");*/
                                } else {
                                        debug_warning(DEBUG, "Not proper cover image type, but set to jpeg. cover_type[%d]", cover_type);
-                                       formatContext->artworkMime = mmfile_strdup("image/jpeg");
+                                       formatContext->artworkMime = g_strdup("image/jpeg");
                                }
 
                                if (formatContext->artwork) {
@@ -1772,18 +1772,18 @@ static int GetTagFromMetaBox(MMFileFormatContext *formatContext, MMFileIOHandle
                                goto exception;
                        }
 
-                       formatContext->title = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_TITLE].value);
-                       formatContext->artist = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_ARTIST].value);
-                       formatContext->copyright = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_COPYRIGHT].value);
-                       formatContext->comment = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_COMMENT].value);
-                       formatContext->album = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_ALBUM].value);
-                       formatContext->album_artist = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_ALBUM_ARTIST].value);
-                       formatContext->year = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_YEAR].value);
-                       formatContext->genre = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_GENRE].value);
-                       formatContext->tagTrackNum = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_TRACKNUM].value);
-                       formatContext->composer = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_COMPOSER].value);
-                       formatContext->classification = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_CONTENT_GROUP].value);
-                       formatContext->conductor = mmfile_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_CONDUCTOR].value);
+                       formatContext->title = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_TITLE].value);
+                       formatContext->artist = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_ARTIST].value);
+                       formatContext->copyright = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_COPYRIGHT].value);
+                       formatContext->comment = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_COMMENT].value);
+                       formatContext->album = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_ALBUM].value);
+                       formatContext->album_artist = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_ALBUM_ARTIST].value);
+                       formatContext->year = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_YEAR].value);
+                       formatContext->genre = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_GENRE].value);
+                       formatContext->tagTrackNum = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_TRACKNUM].value);
+                       formatContext->composer = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_COMPOSER].value);
+                       formatContext->classification = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_CONTENT_GROUP].value);
+                       formatContext->conductor = g_strdup((const char *)tagInfo.tagInfo[AV_ID3TAG_CONDUCTOR].value);
 
                        formatContext->artwork = mmfile_malloc(tagInfo.imageInfo.imageLen);
                        if ((tagInfo.imageInfo.imageLen > 0) && formatContext->artwork) {
@@ -3708,7 +3708,7 @@ void mm_file_id3tag_restore_content_info(AvFileContentInfo *pInfo)
                        if (pInfo->genre > GENRE_COUNT - 1)
                                pInfo->genre = GENRE_COUNT - 1;
 
-                       pInfo->tagInfo[AV_ID3TAG_GENRE].value = mmfile_strdup(MpegAudio_Genre[pInfo->genre]);
+                       pInfo->tagInfo[AV_ID3TAG_GENRE].value = g_strdup(MpegAudio_Genre[pInfo->genre]);
                        if (pInfo->tagInfo[AV_ID3TAG_GENRE].value)
                                pInfo->tagInfo[AV_ID3TAG_GENRE].length = strlen(pInfo->tagInfo[AV_ID3TAG_GENRE].value);
                        else
@@ -3720,7 +3720,7 @@ void mm_file_id3tag_restore_content_info(AvFileContentInfo *pInfo)
                debug_msg(RELEASE, "genre size is Zero Or not UTF16 code! genreLen[%d] genre[%s]\n", pInfo->tagInfo[AV_ID3TAG_GENRE].length, pInfo->tagInfo[AV_ID3TAG_GENRE].value);
 
                if (pInfo->tagInfo[AV_ID3TAG_GENRE].value)
-                       mpegAudioGenre = mmfile_strdup(pInfo->tagInfo[AV_ID3TAG_GENRE].value);
+                       mpegAudioGenre = g_strdup(pInfo->tagInfo[AV_ID3TAG_GENRE].value);
                else
                        pInfo->tagInfo[AV_ID3TAG_GENRE].length = 0;
 
@@ -3752,7 +3752,7 @@ void mm_file_id3tag_restore_content_info(AvFileContentInfo *pInfo)
                        if (idv2IntGenre > GENRE_COUNT - 1 || idv2IntGenre < 0)
                                idv2IntGenre = GENRE_COUNT - 1;
 
-                       pInfo->tagInfo[AV_ID3TAG_GENRE].value = mmfile_strdup(MpegAudio_Genre[idv2IntGenre]);
+                       pInfo->tagInfo[AV_ID3TAG_GENRE].value = g_strdup(MpegAudio_Genre[idv2IntGenre]);
                        if (pInfo->tagInfo[AV_ID3TAG_GENRE].value)
                                pInfo->tagInfo[AV_ID3TAG_GENRE].length = strlen(pInfo->tagInfo[AV_ID3TAG_GENRE].value);
                        else
@@ -3765,7 +3765,7 @@ void mm_file_id3tag_restore_content_info(AvFileContentInfo *pInfo)
                         */
 
                        /* Give space for NULL character. Hence added "+1" */
-                       pInfo->tagInfo[AV_ID3TAG_GENRE].value = mmfile_strdup(mpegAudioGenre);
+                       pInfo->tagInfo[AV_ID3TAG_GENRE].value = g_strdup(mpegAudioGenre);
                        if (pInfo->tagInfo[AV_ID3TAG_GENRE].value)
                                pInfo->tagInfo[AV_ID3TAG_GENRE].length = strlen(pInfo->tagInfo[AV_ID3TAG_GENRE].value);
                        else