Remove unnecessary input parameter

Signed-off-by: Seungha Son <seungha.son@samsung.com>
Change-Id: I4c8ede968bcc9be815f24f20dfc5f060e8263155

diff --git a/include/notification_db.h b/include/notification_db.h
index 1bed61472b2ff99aa4491640f33a3ae70b41c8e1..219e50783b23d719af46fd3654d0a3788598907b 100644 (file)
--- a/include/notification_db.h
+++ b/include/notification_db.h
@@ -26,7 +26,7 @@
 #define NOTIFICATION_EMPTY_STR ""
 #define NOTIFICATION_CHECK_STR(p) ((p) ? (p) : NOTIFICATION_EMPTY_STR)
 
-sqlite3 *notification_db_open(const char *dbfile);
+sqlite3 *notification_db_open();
 int notification_db_close(sqlite3 **db);
 int notification_db_exec(sqlite3 *db, const char *query, int *num_changes);
 char *notification_db_column_text(sqlite3_stmt *stmt, int col);

diff --git a/src/notification_db.c b/src/notification_db.c
index 267db26fb6958d2f58ed25fd9c18c460c5bf145c..4510e1ce738ad09b322fd5842d16d44512172a71 100755 (executable)
--- a/src/notification_db.c
+++ b/src/notification_db.c
@@ -119,12 +119,12 @@ out:
        return ret;
 }
 
-sqlite3 *notification_db_open(const char *dbfile)
+sqlite3 *notification_db_open()
 {
        int ret = 0;
        sqlite3 *db = 0;
 
-       ret = access(dbfile, R_OK | W_OK);
+       ret = access(DBPATH, R_OK | W_OK);
        if (ret != 0) {
                /* LCOV_EXCL_START */
                set_last_result(NOTIFICATION_ERROR_FROM_DB);
@@ -132,7 +132,7 @@ sqlite3 *notification_db_open(const char *dbfile)
                /* LCOV_EXCL_STOP */
        }
 
-       ret = sqlite3_open_v2(dbfile, &db, SQLITE_OPEN_READWRITE, NULL);
+       ret = sqlite3_open_v2(DBPATH, &db, SQLITE_OPEN_READWRITE, NULL);
        if (ret != SQLITE_OK) {
                /* LCOV_EXCL_START */
                if (ret == SQLITE_PERM)

diff --git a/src/notification_group.c b/src/notification_group.c
index e9c50afc2c632d5d01526b729e226d60d7a846ca..ea39ab586a9eaebc1790f5c18a4e3eb77129dd71 100755 (executable)
--- a/src/notification_group.c
+++ b/src/notification_group.c
@@ -71,7 +71,7 @@ int notification_group_set_badge(const char *app_id,
        int ret;
        int result;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -130,7 +130,7 @@ int notification_group_get_badge(const char *app_id,
        int ret;
        int col = 0;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 

diff --git a/src/notification_noti.c b/src/notification_noti.c
index d76b51740280f21ec0d2ed001a20c660ef0ba747..51768e2c4646a98bcbc947543dafefae4d137fda 100755 (executable)
--- a/src/notification_noti.c
+++ b/src/notification_noti.c
@@ -572,7 +572,7 @@ static int _get_notification(char *query_where, notification_h noti)
        if (query_where == NULL || noti == NULL)
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -631,7 +631,7 @@ static int _get_notification_list(char *query_where, notification_list_h *list,
        if (query_where == NULL || list == NULL)
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -992,7 +992,7 @@ EXPORT_API int notification_noti_insert(notification_h noti)
        noti->group_id = NOTIFICATION_GROUP_ID_NONE;
        noti->internal_group_id = NOTIFICATION_GROUP_ID_NONE;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1124,7 +1124,7 @@ EXPORT_API int notification_noti_update(notification_h noti)
                                noti->caller_app_id, noti->display_applist);
        }
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1194,7 +1194,7 @@ EXPORT_API int notification_noti_delete_all(notification_type_e type,
        int i = 0;
        int data_cnt = 0;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1371,7 +1371,7 @@ EXPORT_API int notification_noti_delete_by_priv_id(const char *app_id, int priv_
        if (app_id == NULL)
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1404,7 +1404,7 @@ EXPORT_API int notification_noti_delete_by_priv_id_get_changes(const char *app_i
        char *query = NULL;
        int ret = NOTIFICATION_ERROR_NONE;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1453,7 +1453,7 @@ EXPORT_API int notification_noti_get_count(notification_type_e type,
        if (ret < 0)
                return NOTIFICATION_ERROR_IO_ERROR;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1579,7 +1579,7 @@ EXPORT_API int notification_noti_get_all_count(notification_type_e type, int *co
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
        }
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (db == NULL) {
                ret = get_last_result();
                NOTIFICATION_ERR("Failed to open db [%d]", ret);
@@ -1712,7 +1712,7 @@ EXPORT_API int notification_noti_get_detail_list(const char *app_id,
        if (ret < 0)
                return NOTIFICATION_ERROR_IO_ERROR;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1783,7 +1783,7 @@ EXPORT_API int notification_noti_check_tag(notification_h noti)
        if (noti->tag == NULL)
                return NOTIFICATION_ERROR_NOT_EXIST_ID;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1845,7 +1845,7 @@ EXPORT_API int notification_noti_check_count_for_template(notification_h noti, i
        if (noti == NULL || count == NULL)
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1907,7 +1907,7 @@ EXPORT_API int notification_noti_add_template(notification_h noti, char *templat
        noti->group_id = NOTIFICATION_GROUP_ID_NONE;
        noti->internal_group_id = NOTIFICATION_GROUP_ID_NONE;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1990,7 +1990,7 @@ EXPORT_API int notification_noti_delete_template(const char *pkg_id)
        if (pkg_id == NULL)
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 

diff --git a/src/notification_setting.c b/src/notification_setting.c
index 4e8c62b471d5772bd1c3da285d967f6de03ec347..7eb6e86d153240f407e36262561a996655b7c2d6 100755 (executable)
--- a/src/notification_setting.c
+++ b/src/notification_setting.c
@@ -480,7 +480,7 @@ static int _install_and_update_package(const char *package_name, uid_t uid)
        setting_local_info info;
        pkgmgrinfo_pkginfo_filter_h handle = NULL;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -539,7 +539,7 @@ static int _delete_package_from_setting_db(const char *package_name, uid_t uid)
        int err = NOTIFICATION_ERROR_NONE;
        bool is_package_in_setting_table = false;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -584,7 +584,7 @@ EXPORT_API int notification_setting_refresh_setting_table(uid_t uid)
 
        NOTIFICATION_INFO("Refresh setting table [%d]", uid);
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -1115,7 +1115,7 @@ EXPORT_API int notification_system_setting_init_system_setting_table(uid_t uid)
 
        NOTIFICATION_INFO("init system setting table [%d]", uid);
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (db == NULL)
                return get_last_result(); /* LCOV_EXCL_LINE */
 

diff --git a/src/notification_setting_service.c b/src/notification_setting_service.c
index 0b05ec451a26d4760912e7025ffa7f69a373b742..a58561754e1bf10a78519866a2457b63060b1541 100755 (executable)
--- a/src/notification_setting_service.c
+++ b/src/notification_setting_service.c
@@ -110,7 +110,7 @@ int noti_setting_service_get_setting_by_app_id(const char *app_id, notification_
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
        }
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -198,7 +198,7 @@ int noti_setting_get_setting_array(notification_setting_h *setting_array, int *c
                return  NOTIFICATION_ERROR_INVALID_PARAMETER;
        }
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -288,7 +288,7 @@ int noti_system_setting_load_system_setting(notification_system_setting_h *syste
                return  NOTIFICATION_ERROR_INVALID_PARAMETER;
        }
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -382,7 +382,7 @@ int notification_setting_db_update(const char *package_name, const char *app_id,
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
        }
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -425,7 +425,7 @@ int notification_setting_db_update_system_setting(int do_not_disturb, int visibi
        int ret = NOTIFICATION_ERROR_NONE;
        int num_changes = 0;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -469,7 +469,7 @@ int notification_setting_db_update_do_not_disturb(int do_not_disturb, uid_t uid)
        char *query = NULL;
        int ret = NOTIFICATION_ERROR_NONE;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -511,7 +511,7 @@ int notification_system_setting_get_dnd_schedule_enabled_uid(uid_t **uids, int *
        sqlite3 *db = NULL;
        uid_t *result_uids;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -589,7 +589,7 @@ int notification_get_dnd_and_allow_to_notify(const char *app_id,
        if (app_id == NULL)
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -691,7 +691,7 @@ EXPORT_API int notification_system_setting_load_dnd_allow_exception(dnd_allow_ex
                return  NOTIFICATION_ERROR_INVALID_PARAMETER;
        }
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -756,7 +756,7 @@ int notification_system_setting_update_dnd_allow_exception(int type, int value,
        int ret = NOTIFICATION_ERROR_NONE;
        int num_changes = 0;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -800,7 +800,7 @@ int noti_system_setting_get_do_not_disturb(int *do_not_disturb, uid_t uid)
        char **query_result = NULL;
        sqlite3 *db = NULL;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();
 
@@ -858,7 +858,7 @@ int notification_setting_db_update_app_disabled(const char *app_id, bool value,
        if (app_id == NULL)
                return NOTIFICATION_ERROR_INVALID_PARAMETER;
 
-       db = notification_db_open(DBPATH);
+       db = notification_db_open();
        if (!db)
                return get_last_result();