From bf7d1d57120efe010768e9dbe1bcc6a26c448e62 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Mon, 23 Mar 2020 09:25:01 +0900 Subject: [PATCH] Remove case that cannot be reached Change-Id: I192128eb3cc8d4bcd78939fef2af9494a7710b0b Signed-off-by: Minje Ahn --- src/media_content.c | 13 ++++++------- src/media_db.c | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/media_content.c b/src/media_content.c index cf55609..4aa9fb5 100644 --- a/src/media_content.c +++ b/src/media_content.c @@ -43,16 +43,15 @@ int _content_query_prepare(const char *select_query, const char *condition_query media_content_retvm_if(!STRING_VALID(select_query), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query"); - if (STRING_VALID(condition_query)) { - if (STRING_VALID(option_query)) + /* If 'option_query' is NULL, 'condition_query' is also NULL. */ + if (option_query) { + if (STRING_VALID(condition_query)) query = sqlite3_mprintf("%s AND %s %s", select_query, condition_query, option_query); else - query = sqlite3_mprintf("%s AND %s", select_query, condition_query); - } else { - if (STRING_VALID(option_query)) query = sqlite3_mprintf("%s %s", select_query, option_query); - else - query = sqlite3_mprintf("%s", select_query); + + } else { + query = sqlite3_mprintf("%s", select_query); } ret = _content_get_result(query, stmt); diff --git a/src/media_db.c b/src/media_db.c index 9f68545..9ab32b2 100755 --- a/src/media_db.c +++ b/src/media_db.c @@ -1501,6 +1501,7 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter ret = __media_db_make_query(filter, &condition_query, &option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); + /* If 'filter' is not NULL, 'option_query' must be created. */ if (option_query) { tmp_option = g_strconcat(option_query, ")", NULL); g_free(option_query); -- 2.7.4