Remove unused 'err_attr_name' for 'mm_file_get_attrs'

Change-Id: Ibc9d91f1a435686fe150724c215144eb0943f150

diff --git a/packaging/capi-media-metadata-extractor.spec b/packaging/capi-media-metadata-extractor.spec
index 218bf54..27d3f22 100755 (executable)
--- a/packaging/capi-media-metadata-extractor.spec
+++ b/packaging/capi-media-metadata-extractor.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-metadata-extractor
 Summary:    A media metadata extractor library in Tizen Native API
-Version: 0.1.13
+Version: 0.1.14
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/metadata_extractor.c b/src/metadata_extractor.c
index c4104f5..a5e9ed5 100644 (file)
--- a/src/metadata_extractor.c
+++ b/src/metadata_extractor.c
@@ -134,18 +134,16 @@ static int __metadata_extractor_get_stream_info(metadata_extractor_s *metadata,
 static int __get_content_attrs(metadata_extractor_s *metadata, MMHandleType content)
 {
        int ret = METADATA_EXTRACTOR_ERROR_NONE;
-       char *err_attr_name = NULL;
        int _audio_track_cnt = 0;
        int _video_track_cnt = 0;
 
-       ret = mm_file_get_attrs(content, &err_attr_name,
+       ret = mm_file_get_attrs(content,
                                        MM_FILE_CONTENT_VIDEO_TRACK_COUNT, &_video_track_cnt,
                                        MM_FILE_CONTENT_AUDIO_TRACK_COUNT, &_audio_track_cnt,
                                        NULL);
 
        if (ret != FILEINFO_ERROR_NONE) {
                metadata_extractor_error("METADATA_EXTRACTOR_ERROR_OPERATION_FAILED(0x%08x)", ret);
-               SAFE_FREE(err_attr_name);
                mm_file_destroy_content_attrs(content);
                return METADATA_EXTRACTOR_ERROR_OPERATION_FAILED;
        }
@@ -220,7 +218,6 @@ static bool __is_tag_param_valid(metadata_extractor_s *metadata, const char *att
 static int __metadata_extractor_get_attr_int(metadata_extractor_s *metadata, const char *attribute_name, int *attr)
 {
        int ret = METADATA_EXTRACTOR_ERROR_NONE;
-       char *err_attr_name = NULL;
        int _attr = 0;
 
        metadata_extractor_retvm_if(!metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid metadata");
@@ -228,8 +225,8 @@ static int __metadata_extractor_get_attr_int(metadata_extractor_s *metadata, con
        metadata_extractor_retvm_if(!ME_STRING_VALID(attribute_name), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid attribute_name");
        metadata_extractor_retvm_if(!attr, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid attr");
 
-       ret = mm_file_get_attrs(metadata->attr_h, &err_attr_name, attribute_name, &_attr, NULL);
-       metadata_extractor_retv_free_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, err_attr_name);
+       ret = mm_file_get_attrs(metadata->attr_h, attribute_name, &_attr, NULL);
+       metadata_extractor_retvm_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, "Internal operation error");
 
        *attr = _attr;
 
@@ -270,15 +267,14 @@ static int __metadata_extractor_get_audio_track_count(metadata_extractor_s *meta
 static int __metadata_extractor_get_video_thumbnail(metadata_extractor_s *metadata, void **thumbnail, int *thumbnail_len)
 {
        int ret = METADATA_EXTRACTOR_ERROR_NONE;
-       char *err_attr_name = NULL;
        void *_video_thumbnail = NULL;
        int _video_thumbnail_len = 0;
 
        metadata_extractor_retvm_if((!metadata) || (!metadata->attr_h), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Handle is null");
 
        if (metadata->video_track_cnt > 0) {
-               ret = mm_file_get_attrs(metadata->attr_h, &err_attr_name, MM_FILE_CONTENT_VIDEO_THUMBNAIL, &_video_thumbnail, &_video_thumbnail_len, NULL);
-               metadata_extractor_retv_free_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, err_attr_name);
+               ret = mm_file_get_attrs(metadata->attr_h, MM_FILE_CONTENT_VIDEO_THUMBNAIL, &_video_thumbnail, &_video_thumbnail_len, NULL);
+               metadata_extractor_retvm_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, "Internal operation error");
        }
 
        *thumbnail = _video_thumbnail;
@@ -301,15 +297,14 @@ static int __metadata_extractor_get_video_track_count(metadata_extractor_s *meta
 static int __metadata_extractor_get_tag_str(metadata_extractor_s *metadata, const char *attribute_name, char **tag)
 {
        int ret = METADATA_EXTRACTOR_ERROR_NONE;
-       char *err_attr_name = NULL;
        char *_tag = NULL;
        int _tag_len = 0;
 
        metadata_extractor_retvm_if(!__is_tag_param_valid(metadata, attribute_name), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "fail to __is_tag_param_valid()");
        metadata_extractor_retvm_if(!tag, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid tag");
 
-       ret = mm_file_get_attrs(metadata->tag_h, &err_attr_name, attribute_name, &_tag, &_tag_len, NULL);
-       metadata_extractor_retv_free_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, err_attr_name);
+       ret = mm_file_get_attrs(metadata->tag_h, attribute_name, &_tag, &_tag_len, NULL);
+       metadata_extractor_retvm_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, "Internal operation error");
 
        *tag = _tag;
 
@@ -319,14 +314,13 @@ static int __metadata_extractor_get_tag_str(metadata_extractor_s *metadata, cons
 static int __metadata_extractor_get_tag_int(metadata_extractor_s *metadata, const char *attribute_name, int *tag)
 {
        int ret = METADATA_EXTRACTOR_ERROR_NONE;
-       char *err_attr_name = NULL;
        int _tag = 0;
 
        metadata_extractor_retvm_if(!__is_tag_param_valid(metadata, attribute_name), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "fail to __is_tag_param_valid()");
        metadata_extractor_retvm_if(!tag, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid tag");
 
-       ret = mm_file_get_attrs(metadata->tag_h, &err_attr_name, attribute_name, &_tag, NULL);
-       metadata_extractor_retv_free_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, err_attr_name);
+       ret = mm_file_get_attrs(metadata->tag_h, attribute_name, &_tag, NULL);
+       metadata_extractor_retvm_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, "Internal operation error");
 
        *tag = _tag;
 
@@ -336,14 +330,13 @@ static int __metadata_extractor_get_tag_int(metadata_extractor_s *metadata, cons
 static int __metadata_extractor_get_tag_double(metadata_extractor_s *metadata, const char *attribute_name, double *tag)
 {
        int ret = METADATA_EXTRACTOR_ERROR_NONE;
-       char *err_attr_name = NULL;
        double _tag = 0;
 
        metadata_extractor_retvm_if(!__is_tag_param_valid(metadata, attribute_name), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "fail to __is_tag_param_valid()");
        metadata_extractor_retvm_if(!tag, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid tag");
 
-       ret = mm_file_get_attrs(metadata->tag_h, &err_attr_name, attribute_name, &_tag, NULL);
-       metadata_extractor_retv_free_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, err_attr_name);
+       ret = mm_file_get_attrs(metadata->tag_h, attribute_name, &_tag, NULL);
+       metadata_extractor_retvm_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, "Internal operation error");
 
        *tag = _tag;
 
@@ -353,17 +346,16 @@ static int __metadata_extractor_get_tag_double(metadata_extractor_s *metadata, c
 static int __metadata_extractor_get_artwork(metadata_extractor_s *metadata, void **artwork, int *artwork_size)
 {
        int ret = METADATA_EXTRACTOR_ERROR_NONE;
-       char *err_attr_name = NULL;
        void *_artwork = NULL;
        int _artwork_size = 0;
        int _tag_len = 0;
 
-       ret = mm_file_get_attrs(metadata->tag_h, &err_attr_name, MM_FILE_TAG_ARTWORK_SIZE, &_artwork_size, NULL);
-       metadata_extractor_retv_free_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, err_attr_name);
+       ret = mm_file_get_attrs(metadata->tag_h, MM_FILE_TAG_ARTWORK_SIZE, &_artwork_size, NULL);
+       metadata_extractor_retvm_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, "Internal operation error");
 
        if (_artwork_size > 0) {
-               ret = mm_file_get_attrs(metadata->tag_h, &err_attr_name, MM_FILE_TAG_ARTWORK, &_artwork, &_tag_len, NULL);
-               metadata_extractor_retv_free_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, err_attr_name);
+               ret = mm_file_get_attrs(metadata->tag_h, MM_FILE_TAG_ARTWORK, &_artwork, &_tag_len, NULL);
+               metadata_extractor_retvm_if(ret != FILEINFO_ERROR_NONE, METADATA_EXTRACTOR_ERROR_OPERATION_FAILED, "Internal operation error");
        }
 
        *artwork = _artwork;