Remove useless parameter checking code

Change-Id: I3901fb99a19be0489743d52eeedd33cbc67b4362

diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index 54b04b6ff3f475f3df25c95b15506476c2524c9b..efc8b733c4895ab2be2221f660ce54197631d2f3 100644 (file)
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -77,7 +77,7 @@ static int __mc_db_disable_journal_mode(sqlite3 *handle)
        int ret = SQLITE_OK;
        char *sql = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
+       mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle");
 
        sql = sqlite3_mprintf("%s", "PRAGMA journal_mode = OFF");
        mc_retvm_if(!MC_STRING_VALID(sql), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null");
@@ -215,8 +215,7 @@ static int __mc_db_activate_server(sqlite3 *db_handle, const char *app_id)
 
        mc_debug_fenter();
 
-       mc_retvm_if(db_handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle");
-       mc_retvm_if(app_id == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid app_id");
+       mc_retvm_if(!app_id, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid app_id");
 
        if (__mc_db_is_latest(db_handle, app_id)) {
                ret = __mc_update_latest_server_info_to_db(db_handle, MC_SERVER_STATE_ACTIVATE, MC_PLAYBACK_STATE_STOPPED);
@@ -238,8 +237,7 @@ static int __mc_db_deactivate_server(sqlite3 *db_handle, const char *app_id)
 
        mc_debug_fenter();
 
-       mc_retvm_if(db_handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle");
-       mc_retvm_if(app_id == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid app_id");
+       mc_retvm_if(!app_id, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid app_id");
 
        /* Update server_state to deactivated, if the server is latest.
         * Remove server from app_list, if it is not latest.
@@ -264,8 +262,7 @@ static int __mc_db_insert_to_list(sqlite3 *db_handle, const char *app_id, mc_pri
 
        mc_debug_fenter();
 
-       mc_retvm_if(db_handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle");
-       mc_retvm_if(app_id == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid app_id");
+       mc_retvm_if(!app_id, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid app_id");
 
        mc_secure_debug("app_id: %s, priv_type: %d", app_id, priv_type);
 
@@ -290,8 +287,7 @@ static int __mc_db_delete_from_list(sqlite3 *db_handle, const char *app_id, mc_p
 
        mc_debug_fenter();
 
-       mc_retvm_if(db_handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid handle");
-       mc_retvm_if(app_id == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid app_id");
+       mc_retvm_if(!app_id, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid app_id");
 
        mc_secure_debug("app_id: %s, priv_type: %d", app_id, priv_type);
 
@@ -328,7 +324,7 @@ int mc_db_connect(sqlite3 **handle, uid_t uid, gboolean needwrite)
        int ret = SQLITE_OK;
        sqlite3 *db_handle = NULL;
        char * db_path = NULL;
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
+       mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle");
 
        *handle = NULL;
 
@@ -377,7 +373,7 @@ int mc_db_util_check_integrity(sqlite3 *handle)
        sqlite3_stmt *stmt = NULL;
        const char integrity_check_query[] = "PRAGMA integrity_check";
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
+       mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle");
 
        ret = sqlite3_prepare_v2(handle, integrity_check_query, strlen(integrity_check_query), &stmt, NULL);
        if (ret != SQLITE_OK) {
@@ -444,8 +440,6 @@ int mc_db_util_create_tables(sqlite3 *handle)
        char *sql_str = NULL;
        unsigned long long ability_decided = 0, ability_supported = 0;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-
        /* TABLE */
        sql_str = sqlite3_mprintf("CREATE TABLE IF NOT EXISTS %q(name TEXT PRIMARY KEY)", MC_DB_TABLE_LATEST_SERVER);
        ret = mc_db_util_update_db(handle, sql_str);
@@ -529,8 +523,8 @@ int mc_db_util_update_db(sqlite3 *handle, const char *sql_str)
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *err_msg = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(sql_str == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "sql_str is NULL");
+       mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle");
+       mc_retvm_if(!sql_str, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid sql_str");
 
        mc_secure_debug("Update query [%s]", sql_str);
 
@@ -546,8 +540,6 @@ int mc_db_util_update_db(sqlite3 *handle, const char *sql_str)
 
 int mc_db_util_init_latest_server_table(sqlite3 *handle)
 {
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-
        /* Update server_state and playback_state to 0 */
        return __mc_update_latest_server_info_to_db(handle, MC_SERVER_STATE_DEACTIVATE, MC_PLAYBACK_STATE_STOPPED);
 }
@@ -557,8 +549,6 @@ int mc_db_util_delete_app_list(sqlite3 *handle)
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-
        sql_str = sqlite3_mprintf("DELETE FROM %q", MC_DB_TABLE_APP_LIST);
        ret = mc_db_util_update_db(handle, sql_str);
        SQLITE3_SAFE_FREE(sql_str);
@@ -573,8 +563,8 @@ int mc_db_util_get_user_version(sqlite3 *handle, int *version)
        const char *sql_str = "PRAGMA user_version";
        sqlite3_stmt *stmt = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-       mc_retvm_if(version == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "version is NULL");
+       mc_retvm_if(!handle, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid handle");
+       mc_retvm_if(!version, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid version");
 
        ret = sqlite3_prepare_v2(handle, sql_str, strlen(sql_str), &stmt, NULL);
        mc_retvm_if(SQLITE_OK != ret, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "prepare error [%s]", sqlite3_errmsg(handle));
@@ -592,8 +582,6 @@ int mc_db_util_set_user_version(sqlite3 *handle)
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        char *sql_str = NULL;
 
-       mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
-
        sql_str = sqlite3_mprintf("PRAGMA user_version=%d", MC_DB_LATEST_VERSION);
        ret = mc_db_util_update_db(handle, sql_str);
        SQLITE3_SAFE_FREE(sql_str);
@@ -904,15 +892,9 @@ int mc_db_add_application(uid_t uid, const char *app_id, const mc_priv_type_e pr
 
        mc_debug_fenter();
 
-       mc_retvm_if(app_id == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid app_id");
+       mc_retvm_if(!app_id, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid app_id");
        mc_retvm_if((priv_type != MC_PRIV_TYPE_SERVER) && (priv_type != MC_PRIV_TYPE_CLIENT), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid priv_type[%d]", priv_type);
-
-       ret = mc_db_connect(&db_handle, uid, TRUE);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-               mc_error("mc_db_connect error : %d", ret);
-               mc_db_disconnect(db_handle);
-               return ret;
-       }
+       mc_retvm_if(mc_db_connect(&db_handle, uid, TRUE) != MEDIA_CONTROLLER_ERROR_NONE, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "fail to mc_db_connect");
 
        ret = __mc_db_insert_to_list(db_handle, app_id, priv_type);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
@@ -941,15 +923,9 @@ int mc_db_remove_application(uid_t uid, const char *app_id, const mc_priv_type_e
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        sqlite3 *db_handle = NULL;
 
-       mc_retvm_if(app_id == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid app_id");
+       mc_retvm_if(!app_id, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid app_id");
        mc_retvm_if((priv_type != MC_PRIV_TYPE_SERVER) && (priv_type != MC_PRIV_TYPE_CLIENT), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "invalid priv_type[%d]", priv_type);
-
-       ret = mc_db_connect(&db_handle, uid, TRUE);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
-               mc_error("mc_db_connect error : %d", ret);
-               mc_db_disconnect(db_handle);
-               return ret;
-       }
+       mc_retvm_if(mc_db_connect(&db_handle, uid, TRUE) != MEDIA_CONTROLLER_ERROR_NONE, MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "fail to mc_db_connect");
 
        /* Delete application from app list */
        ret = __mc_db_delete_from_list(db_handle, app_id, priv_type);