Cleanup log

Change-Id: If0bd5679fae856d0b13fb186f4622ef9b50886b6
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

1 files changed, 21 insertions, 14 deletions

diff --git a/src/metadata_extractor.c b/src/metadata_extractor.c
index b1a2b1a..032a177 100644
--- a/src/metadata_extractor.c
+++ b/src/metadata_extractor.c
@@ -460,7 +460,8 @@ int metadata_extractor_set_path(metadata_extractor_h metadata, const char *path)
 	int ret = METADATA_EXTRACTOR_ERROR_NONE;
 	metadata_extractor_s *_metadata = (metadata_extractor_s *)metadata;
 
-	metadata_extractor_retvm_if((_metadata == NULL) || (path == NULL), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!_metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Handle is NULL");
+	metadata_extractor_retvm_if(!path, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "path is NULL");
 
 	/*check file path.. */
 	if (!g_file_test(path, G_FILE_TEST_IS_REGULAR)) {
@@ -487,7 +488,9 @@ int metadata_extractor_set_buffer(metadata_extractor_h metadata, const void *buf
 	int ret = METADATA_EXTRACTOR_ERROR_NONE;
 	metadata_extractor_s *_metadata = (metadata_extractor_s *)metadata;
 
-	metadata_extractor_retvm_if((_metadata == NULL) || (buffer == NULL) || (size <= 0), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!_metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Handle is NULL");
+	metadata_extractor_retvm_if(!buffer, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "buffer is NULL");
+	metadata_extractor_retvm_if(size <= 0, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid size");
 
 	if ((_metadata->path != NULL) || (_metadata->buffer != NULL)) {
 		__metadata_extractor_destroy_handle(_metadata);
@@ -526,7 +529,8 @@ int metadata_extractor_get_synclyrics(metadata_extractor_h metadata, int index,
 	char *_lyrics = NULL;
 	int _synclyrics_num = 0;
 
-	metadata_extractor_retvm_if((!_metadata) || ((!_metadata->path) && (!_metadata->buffer)), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!_metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Handle is NULL");
+	metadata_extractor_retvm_if(!_metadata->path && !_metadata->buffer, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
 	*lyrics = NULL;
 	*time_stamp = 0;
@@ -556,8 +560,6 @@ static int __extract_meta(metadata_extractor_s *metadata, metadata_extractor_att
 {
 	metadata_extractor_retvm_if(!metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-	/*metadata_extractor_debug("attribute [%d]", attribute); */
-
 	if ((attribute == METADATA_HAS_VIDEO) || (attribute == METADATA_HAS_AUDIO)) {
 		if (metadata->path != NULL)
 			return __metadata_extractor_check_and_extract_meta(metadata, METADATA_TYPE_STREAM);
@@ -592,12 +594,13 @@ int metadata_extractor_get_metadata(metadata_extractor_h metadata, metadata_extr
 	int is_string = 0;
 	int is_double = 0;
 
-	metadata_extractor_retvm_if((!_metadata) || ((!_metadata->path) && (!_metadata->buffer)), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!_metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Handle is NULL");
+	metadata_extractor_retvm_if(!_metadata->path && !_metadata->buffer, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
 	*value = NULL;
 
 	ret = __extract_meta(_metadata, attribute);
-	metadata_extractor_retvm_if(ret != METADATA_EXTRACTOR_ERROR_NONE, ret, "fail to __metadata_extractor_extract_meta() [%d]", ret);
+	metadata_extractor_retvm_if(ret != METADATA_EXTRACTOR_ERROR_NONE, ret, "fail to __extract_meta [%d]", ret);
 
 	switch ((int)attribute) {  /*TODO (m.alieksieie): Remove casting after ACR*/
 	case METADATA_DURATION: {
@@ -961,22 +964,22 @@ int metadata_extractor_get_artwork(metadata_extractor_h metadata, void **artwork
 	int _artwork_size = 0;
 	char *_artwork_mime = NULL;
 
-	metadata_extractor_retvm_if((!_metadata) || ((!_metadata->path) && (!_metadata->buffer)), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!_metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Handle is NULL");
+	metadata_extractor_retvm_if(!_metadata->path && !_metadata->buffer, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
 	*artwork = NULL;
 	*mime_type = NULL;
 	*size = 0;
 
 	ret = __metadata_extractor_check_and_extract_meta(_metadata, METADATA_TYPE_TAG);
-	metadata_extractor_retvm_if(ret != METADATA_EXTRACTOR_ERROR_NONE, ret, "Error in __metadata_extractor_check_and_extract_meta()");
+	metadata_extractor_retvm_if(ret != METADATA_EXTRACTOR_ERROR_NONE, ret, "Fail: __metadata_extractor_check_and_extract_meta");
 
 	ret = __metadata_extractor_get_artwork(_metadata, &_artwork, &_artwork_size);
-	metadata_extractor_retvm_if(ret != METADATA_EXTRACTOR_ERROR_NONE, ret, "Fail to get artwork");
+	metadata_extractor_retvm_if(ret != METADATA_EXTRACTOR_ERROR_NONE, ret, "Fail: __metadata_extractor_get_artwork");
 
 	if (_artwork_size > 0 && _artwork) {
 		ret = __metadata_extractor_get_tag_str(_metadata, MM_FILE_TAG_ARTWORK_MIME, &_artwork_mime);
-		if (ret != METADATA_EXTRACTOR_ERROR_NONE)
-			return ret;
+		metadata_extractor_retvm_if(ret != METADATA_EXTRACTOR_ERROR_NONE, ret, "Fail: __metadata_extractor_get_tag_str");
 
 		*artwork = g_memdup(_artwork, _artwork_size);
 		*size = _artwork_size;
@@ -993,7 +996,9 @@ int metadata_extractor_get_frame(metadata_extractor_h metadata, void **frame, in
 	void *_frame = NULL;
 	int _frame_size = 0;
 
-	metadata_extractor_retvm_if((!_metadata) || ((!_metadata->path) && (!_metadata->buffer)) || (!size), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!_metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Handle is NULL");
+	metadata_extractor_retvm_if(!_metadata->path && !_metadata->buffer, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!size, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
 	*frame = NULL;
 	*size = 0;
@@ -1024,7 +1029,9 @@ int metadata_extractor_get_frame_at_time(metadata_extractor_h metadata, unsigned
 	int height = 0;
 	long long micro_timestamp = 0;
 
-	metadata_extractor_retvm_if((!_metadata) || ((!_metadata->path) && (!_metadata->buffer)) || (!size), METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!_metadata, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Handle is NULL");
+	metadata_extractor_retvm_if(!_metadata->path && !_metadata->buffer, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
+	metadata_extractor_retvm_if(!size, METADATA_EXTRACTOR_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
 	micro_timestamp = (long long)timestamp * 1000;
 	*frame = NULL;