From f2bfe46537d02d5cb0c3c47845de5603fa62ee11 Mon Sep 17 00:00:00 2001 From: Susnata Sovalin Date: Wed, 12 Dec 2018 17:17:43 +0530 Subject: [PATCH] Updating debug logs for format check enforcement Change-Id: I1db1955191f0fb95eba2b0be06860874de1e30b2 Signed-off-by: Susnata Sovalin --- geofence-server/src/geofence_server.c | 2 +- geofence-server/src/geofence_server_db.c | 2 +- geofence-server/src/geofence_server_internal.c | 2 +- geofence-server/src/server.c | 10 +++++----- module/module_geofence_server.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index 179a497..d8cff49 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -2222,7 +2222,7 @@ static void dbus_start_geofence_cb(gint fence_id, const gchar *app_id, gpointer } else { rv = wifi_manager_ap_get_bssid(ap_h, &ap_bssid); if (rv != WIFI_MANAGER_ERROR_NONE) { - LOGI_GEOFENCE("Fail to get the bssid: [%d]\n", __convert_wifi_error_to_string(rv)); + LOGI_GEOFENCE("Fail to get the bssid: [%s]\n", __convert_wifi_error_to_string(rv)); } else { bssidlen = strlen(ap_bssid); LOGI_GEOFENCE("Connected AP: %s, %d\n", ap_bssid, bssidlen); diff --git a/geofence-server/src/geofence_server_db.c b/geofence-server/src/geofence_server_db.c index f4c4988..3a6a340 100755 --- a/geofence-server/src/geofence_server_db.c +++ b/geofence-server/src/geofence_server_db.c @@ -820,7 +820,7 @@ int geofence_manager_set_common_info(fence_common_info_s *fence_info, int *fence return FENCE_ERR_PREPARE; } - LOGD_GEOFENCE("place_id[%d], enable[%d], appid[%s] geofence_type[%d] access_type[%d] running_status[%d]", fence_info->place_id, fence_info->enable, fence_info->appid, fence_info->running_status, fence_info->type, fence_info->access_type, fence_info->place_id); + LOGD_GEOFENCE("place_id[%d], enable[%d], appid[%s] geofence_type[%d] access_type[%d] running_status[%d]", fence_info->place_id, fence_info->enable, fence_info->appid, fence_info->type, fence_info->access_type, fence_info->running_status); ret = sqlite3_bind_int(state, ++index, fence_info->place_id); SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); diff --git a/geofence-server/src/geofence_server_internal.c b/geofence-server/src/geofence_server_internal.c index 51a002e..4282f26 100644 --- a/geofence-server/src/geofence_server_internal.c +++ b/geofence-server/src/geofence_server_internal.c @@ -42,7 +42,7 @@ GeofenceItemData *__get_item_by_fence_id(gint fence_id, GeofenceServer *geofence GList *found_item = NULL; found_item = g_list_find_custom(geofence_server->geofence_list, &fence_id, __find_custom_item_by_fence_id); if (found_item == NULL || found_item->data == NULL) { - LOGD_GEOFENCE("item_data is not found. found_item[%d]", found_item); + LOGE_GEOFENCE("item_data is not found. found_item is NULL\n"); return NULL; } /*Get the item from the list and return it*/ diff --git a/geofence-server/src/server.c b/geofence-server/src/server.c index a0c7aae..b063be9 100644 --- a/geofence-server/src/server.c +++ b/geofence-server/src/server.c @@ -249,7 +249,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) bt_deinitialize(); return -1; } else { - LOGD_GEOFENCE("bt_adapter_set_state_changed_cb() success.", ret); + LOGD_GEOFENCE("bt_adapter_set_state_changed_cb() success %d.", ret); } /* register the bluetooth device connection state changed callback*/ @@ -260,7 +260,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) bt_deinitialize(); return -1; } else { - LOGD_GEOFENCE("bt_device_set_connection_state_changed_cb() success.", ret); + LOGD_GEOFENCE("bt_device_set_connection_state_changed_cb() success %d.", ret); } /*register for the discovery state change callback*/ ret = bt_adapter_set_device_discovery_state_changed_cb(__geofence_bt_adapter_device_discovery_state_changed_cb, (void *)geofence_server); @@ -289,7 +289,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) geofence_server->wifi_h = NULL; return -1; } else { - LOGD_GEOFENCE("wifi_manager_set_connection_state_changed_cb() success.", ret); + LOGD_GEOFENCE("wifi_manager_set_connection_state_changed_cb() success(%d).", ret); } ret = wifi_manager_set_device_state_changed_cb(geofence_server->wifi_h, __geofence_wifi_device_state_changed_cb, geofence_server); @@ -301,7 +301,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) geofence_server->wifi_h = NULL; return -1; } else { - LOGD_GEOFENCE("wifi_manager_set_device_state_changed_cb() success.", ret); + LOGD_GEOFENCE("wifi_manager_set_device_state_changed_cb() success %d.", ret); } ret = wifi_manager_set_rssi_level_changed_cb(geofence_server->wifi_h, __geofence_wifi_rssi_level_changed_cb, geofence_server); @@ -313,7 +313,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) geofence_server->wifi_h = NULL; return -1; } else { - LOGD_GEOFENCE("wifi_manager_set_rssi_level_changed_cb() success.", ret); + LOGD_GEOFENCE("wifi_manager_set_rssi_level_changed_cb() success(%d).", ret); } /*Set the callback for location*/ diff --git a/module/module_geofence_server.c b/module/module_geofence_server.c index ff80d10..a4c9afb 100644 --- a/module/module_geofence_server.c +++ b/module/module_geofence_server.c @@ -381,7 +381,7 @@ EXPORT_API int start_geofence(void *handle, int fence_id) int ret = GEOFENCE_MANAGER_ERROR_NONE; - MOD_LOGD("geofence-server(%x)", geofence_manager); + MOD_LOGD("geofence-server(%p)", (void*)geofence_manager); ret = geo_client_start_geofence(geofence_manager->geofence_client, geofence_manager->app_id, fence_id); if (ret != GEOFENCE_MANAGER_ERROR_NONE) { @@ -395,7 +395,7 @@ EXPORT_API int start_geofence(void *handle, int fence_id) EXPORT_API int stop_geofence(void *handle, int fence_id) { GeofenceManagerData *geofence_manager = (GeofenceManagerData *)handle; - MOD_LOGD("geofence_manager->geofence_cb : %x", geofence_manager->geofence_cb); + MOD_LOGD("geofence_manager->geofence_cb : %p", geofence_manager->geofence_cb); g_return_val_if_fail(geofence_manager, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER); g_return_val_if_fail(geofence_manager->geofence_client, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER); -- 2.7.4