From: saerome.kim Date: Tue, 30 Jul 2019 01:46:27 +0000 (+0900) Subject: Deleted multiple macros in the same meaning. X-Git-Tag: accepted/tizen/unified/20190730.224309~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=989c618363510aba4c2d77d944b4dfb951f32594;p=platform%2Fcore%2Fconnectivity%2Fua-manager.git Deleted multiple macros in the same meaning. Change-Id: Ia9e0cab1dc62104d2ca799f9ecc5c66a43948814 Signed-off-by: saerome.kim --- diff --git a/ua-daemon/include/ua-manager-database.h b/ua-daemon/include/ua-manager-database.h index bb81032..fb5f3cd 100644 --- a/ua-daemon/include/ua-manager-database.h +++ b/ua-daemon/include/ua-manager-database.h @@ -40,40 +40,7 @@ extern "C" { } \ } while (0) -#define PREPARE_DELETE(rc, db, stm, query, finalize) do { \ - rc = sqlite3_prepare_v2(db, query, -1, &stm, NULL); \ - if (rc != SQLITE_OK) { \ - stm = NULL; \ - finalize(); \ - UAM_ERR("Failed to prepare \"%s\" query" \ - , query); \ - return rc; \ - } \ -} while (0) - -#define PREPARE_SELECT(rc, db, stm, query, finalize) do { \ - rc = sqlite3_prepare_v2(db, query, -1, &stm, NULL); \ - if (rc != SQLITE_OK) { \ - stm = NULL; \ - finalize(); \ - UAM_ERR("Failed to prepare \"%s\" query" \ - , query); \ - return rc; \ - } \ -} while (0) - -#define PREPARE_UPDATE(rc, db, stm, query, finalize) do { \ - rc = sqlite3_prepare_v2(db, query, -1, &stm, NULL); \ - if (rc != SQLITE_OK) { \ - stm = NULL; \ - finalize(); \ - UAM_ERR("Failed to prepare \"%s\" query" \ - , query); \ - return rc; \ - } \ -} while (0) - -#define PREPARE_INSERT(rc, db, stm, query, finalize) do { \ +#define PREPARE_QUERY(rc, db, stm, query, finalize) do { \ rc = sqlite3_prepare_v2(db, query, -1, &stm, NULL); \ if (rc != SQLITE_OK) { \ stm = NULL; \ diff --git a/ua-daemon/src/ua-manager-device-db.c b/ua-daemon/src/ua-manager-device-db.c index 8fe6490..9fc1817 100644 --- a/ua-daemon/src/ua-manager-device-db.c +++ b/ua-daemon/src/ua-manager-device-db.c @@ -138,9 +138,9 @@ static int __ua_device_prepare_delete(sqlite3 *db) return SQLITE_OK; } - PREPARE_DELETE(rc, db, delete_all_devices, + PREPARE_QUERY(rc, db, delete_all_devices, DELETE_ALL_DEVICES, __ua_device_finalize_delete); - PREPARE_DELETE(rc, db, delete_device_info, + PREPARE_QUERY(rc, db, delete_device_info, DELETE_DEVICE_INFO, __ua_device_finalize_delete); initialized = 1; @@ -159,13 +159,13 @@ static int __ua_device_prepare_select(sqlite3 *db) return SQLITE_OK; } - PREPARE_SELECT(rc, db, select_all_devices, + PREPARE_QUERY(rc, db, select_all_devices, SELECT_ALL_DEVICES, __ua_device_finalize_select); - PREPARE_SELECT(rc, db, select_device, + PREPARE_QUERY(rc, db, select_device, SELECT_DEVICE, __ua_device_finalize_select); - PREPARE_SELECT(rc, db, select_device_number, + PREPARE_QUERY(rc, db, select_device_number, SELECT_DEVICE_NUMBER, __ua_device_finalize_select); - PREPARE_SELECT(rc, db, select_max_device_number, + PREPARE_QUERY(rc, db, select_max_device_number, SELECT_MAX_DEVICE_NUMBER, __ua_device_finalize_select); initialized = 1; @@ -184,13 +184,13 @@ static int __ua_device_prepare_update(sqlite3 *db) return SQLITE_OK; } - PREPARE_UPDATE(rc, db, update_timestamp, + PREPARE_QUERY(rc, db, update_timestamp, UPDATE_TIMESTAMP, __ua_device_finalize_update); - PREPARE_UPDATE(rc, db, update_presence, + PREPARE_QUERY(rc, db, update_presence, UPDATE_PRESENCE, __ua_device_finalize_update); - PREPARE_UPDATE(rc, db, update_ip_address, + PREPARE_QUERY(rc, db, update_ip_address, UPDATE_IP_ADDRESS, __ua_device_finalize_update); - PREPARE_UPDATE(rc, db, update_discriminant, + PREPARE_QUERY(rc, db, update_discriminant, UPDATE_DISCRIMINANT, __ua_device_finalize_update); initialized = 1; @@ -209,7 +209,7 @@ static int __ua_device_prepare_insert(sqlite3 *db) return SQLITE_OK; } - PREPARE_INSERT(rc, db, insert_device_info, + PREPARE_QUERY(rc, db, insert_device_info, INSERT_DEVICE, __ua_device_finalize_insert); initialized = 1; diff --git a/ua-daemon/src/ua-manager-device-service-db.c b/ua-daemon/src/ua-manager-device-service-db.c index 0f22936..e6f06b8 100644 --- a/ua-daemon/src/ua-manager-device-service-db.c +++ b/ua-daemon/src/ua-manager-device-service-db.c @@ -104,11 +104,11 @@ static int __ua_device_service_prepare_delete(sqlite3 *db) return SQLITE_OK; } - PREPARE_DELETE(rc, db, delete_all_device_services, + PREPARE_QUERY(rc, db, delete_all_device_services, DELETE_ALL_DEVICE_SERVICES, __ua_device_service_finalize_delete); - PREPARE_DELETE(rc, db, delete_service, + PREPARE_QUERY(rc, db, delete_service, DELETE_SERVICE, __ua_device_service_finalize_delete); - PREPARE_DELETE(rc, db, delete_device_service, + PREPARE_QUERY(rc, db, delete_device_service, DELETE_DEVICE_SERVICE, __ua_device_service_finalize_delete); initialized = 1; @@ -127,7 +127,7 @@ static int __ua_device_service_prepare_select(sqlite3 *db) return SQLITE_OK; } - PREPARE_SELECT(rc, db, select_service, + PREPARE_QUERY(rc, db, select_service, SELECT_SERVICE, __ua_device_service_finalize_select); initialized = 1; @@ -154,7 +154,7 @@ static int __ua_device_service_prepare_insert(sqlite3 *db) return SQLITE_OK; } - PREPARE_INSERT(rc, db, insert_device_service, + PREPARE_QUERY(rc, db, insert_device_service, INSERT_DEVICE_SERVICE, __ua_device_service_finalize_insert); initialized = 1; diff --git a/ua-daemon/src/ua-manager-service-db.c b/ua-daemon/src/ua-manager-service-db.c index c6d6eec..eae9ce0 100644 --- a/ua-daemon/src/ua-manager-service-db.c +++ b/ua-daemon/src/ua-manager-service-db.c @@ -109,9 +109,9 @@ static int __ua_service_prepare_delete(sqlite3 *db) return SQLITE_OK; } - PREPARE_DELETE(rc, db, delete_all_services, + PREPARE_QUERY(rc, db, delete_all_services, DELETE_ALL_SERVICES, __ua_service_finalize_delete); - PREPARE_DELETE(rc, db, delete_service_info, + PREPARE_QUERY(rc, db, delete_service_info, DELETE_SERVICE_INFO, __ua_service_finalize_delete); initialized = 1; @@ -130,11 +130,11 @@ static int __ua_service_prepare_select(sqlite3 *db) return SQLITE_OK; } - PREPARE_SELECT(rc, db, select_all_services, + PREPARE_QUERY(rc, db, select_all_services, SELECT_ALL_SERVICES, __ua_service_finalize_select); - PREPARE_SELECT(rc, db, select_service, + PREPARE_QUERY(rc, db, select_service, SELECT_SERVICE, __ua_service_finalize_select); - PREPARE_SELECT(rc, db, select_max_service_number, + PREPARE_QUERY(rc, db, select_max_service_number, SELECT_MAX_SERVICE_NUMBER, __ua_service_finalize_select); initialized = 1; @@ -153,7 +153,7 @@ static int __ua_service_prepare_update(sqlite3 *db) return SQLITE_OK; } - PREPARE_UPDATE(rc, db, update_cycle, + PREPARE_QUERY(rc, db, update_cycle, UPDATE_CYCLE, __ua_service_finalize_update); initialized = 1; @@ -172,7 +172,7 @@ static int __ua_service_prepare_insert(sqlite3 *db) return SQLITE_OK; } - PREPARE_INSERT(rc, db, insert_service_info, + PREPARE_QUERY(rc, db, insert_service_info, INSERT_SERVICE, __ua_service_finalize_insert); initialized = 1; diff --git a/ua-daemon/src/ua-manager-user-db.c b/ua-daemon/src/ua-manager-user-db.c index 15ae9f1..2bb5ae0 100644 --- a/ua-daemon/src/ua-manager-user-db.c +++ b/ua-daemon/src/ua-manager-user-db.c @@ -112,9 +112,9 @@ static int __ua_prepare_delete(sqlite3 *db) return SQLITE_OK; } - PREPARE_DELETE(rc, db, delete_all_users_data, + PREPARE_QUERY(rc, db, delete_all_users_data, DELETE_ALL_USERS_DATA, __ua_finalize_delete); - PREPARE_DELETE(rc, db, delete_user_info, + PREPARE_QUERY(rc, db, delete_user_info, DELETE_USER_INFO, __ua_finalize_delete); initialized = 1; @@ -133,11 +133,11 @@ static int __ua_prepare_select(sqlite3 *db) return SQLITE_OK; } - PREPARE_SELECT(rc, db, select_all_users_data, + PREPARE_QUERY(rc, db, select_all_users_data, SELECT_ALL_USERS_DATA, __ua_finalize_select); - PREPARE_SELECT(rc, db, select_user_data, + PREPARE_QUERY(rc, db, select_user_data, SELECT_USER_DATA, __ua_finalize_select); - PREPARE_SELECT(rc, db, select_max_user_id, + PREPARE_QUERY(rc, db, select_max_user_id, SELECT_MAX_USER_ID, __ua_finalize_select); initialized = 1; @@ -164,7 +164,7 @@ static int __ua_prepare_insert(sqlite3 *db) return SQLITE_OK; } - PREPARE_INSERT(rc, db, insert_user_info, + PREPARE_QUERY(rc, db, insert_user_info, INSERT_USER_INFO, __ua_finalize_insert); initialized = 1;