X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcommon%2Fmedia-svc-album.c;h=c32f44cc669522c57db5012542013626418aba4d;hb=c95fb65aae3a1924bc4b54afd35fc55aac69f3b5;hp=29492702548160aa8b912d1e4e3d403bb5db19e1;hpb=53c5d6b3999850473306e4c7b8d789477649e2fc;p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git

diff --git a/src/common/media-svc-album.c b/src/common/media-svc-album.c
index 2949270..c32f44c 100755
--- a/src/common/media-svc-album.c
+++ b/src/common/media-svc-album.c
@@ -29,20 +29,16 @@ int _media_svc_get_album_id(sqlite3 *handle, const char *album, const char *arti
 	sqlite3_stmt *sql_stmt = NULL;
 	char *sql = NULL;
 
-	media_svc_retvm_if(album == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "album is NULL");
-
-	if (artist)
-		sql = sqlite3_mprintf("SELECT album_id FROM %s WHERE name=%Q AND artist=%Q", DB_TABLE_ALBUM, album, artist);
-	else
-		sql = sqlite3_mprintf("SELECT album_id FROM %s WHERE name=%Q AND artist IS NULL", DB_TABLE_ALBUM, album);
+	media_svc_retvm_if(!album, MS_MEDIA_ERR_INVALID_PARAMETER, "album is NULL");
+	media_svc_retvm_if(!artist, MS_MEDIA_ERR_INVALID_PARAMETER, "artist is NULL");
 
+	sql = sqlite3_mprintf("SELECT album_id FROM %s WHERE name=%Q AND artist=%Q", DB_TABLE_ALBUM, album, artist);
 	ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
-
 	if (ret != MS_MEDIA_ERR_NONE) {
 		if (ret == MS_MEDIA_ERR_DB_NO_RECORD)
 			media_svc_debug("there is no album.");
 		else
-			media_svc_error("error when _media_svc_get_album_id. err = [%d]", ret);
+			media_svc_error("failed to get album id[%d]", ret);
 
 		return ret;
 	}