From 10a1f2965ad89781c710508d3f708334c5434d43 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 24 Sep 2020 18:01:46 +0900 Subject: [PATCH] Rename function names Change-Id: I1cfc3c0c90d339e31e9a22e783b1f15249aae09e Signed-off-by: Jihoon Kim --- receiver/src/ft.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp index d0e0b7f..f797447 100644 --- a/receiver/src/ft.cpp +++ b/receiver/src/ft.cpp @@ -93,6 +93,8 @@ static int sync_success_cnt = 0; static gboolean job_progress = FALSE; static int sync_complete_flags = 0; +static void sticker_service_quit(); + static void save_last_sync_time() { // save last sync time in preference @@ -629,10 +631,10 @@ static void _on_transfer_file_cb(sap_peer_agent_h peer_agent_h, accept_file(); } -void conn_terminated(sap_peer_agent_h peer_agent, - sap_socket_h socket, - sap_service_connection_terminated_reason_e result, - void *user_data) +static void _on_connection_terminated(sap_peer_agent_h peer_agent, + sap_socket_h socket, + sap_service_connection_terminated_reason_e result, + void *user_data) { sap_info_s *priv = NULL; priv = (sap_info_s *)user_data; @@ -658,13 +660,14 @@ void conn_terminated(sap_peer_agent_h peer_agent, set_sync_progressing(FALSE); send_message("sync_stop_result", "cancel"); - service_app_exit(); + sticker_service_quit(); } -static void quit() +static void sticker_service_quit() { job_progress = FALSE; send_disconnect_message(); + STLOGI("Terminate sticker service"); service_app_exit(); } @@ -801,7 +804,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in #endif if (!process_request_queue()) { - quit(); + sticker_service_quit(); } } else if (msg_id == STICKER_SYNC_START_RSP) { STLOGD("msg : %s", msg_id.c_str()); @@ -858,7 +861,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in set_sync_progressing(FALSE); save_last_sync_time(); - quit(); + sticker_service_quit(); } } } else if (msg_id == STICKER_SEND_START_REQ) { @@ -995,7 +998,7 @@ on_data_received(sap_socket_h socket, unsigned short int channel_id, unsigned in if (!process_request_queue()) { sync_success_cnt = 0; - quit(); + sticker_service_quit(); } } else STLOGW("unknown msg id : %s", msg_id.c_str()); @@ -1019,7 +1022,7 @@ static void on_conn_req(sap_peer_agent_h peer_agent, STLOGI("Connection success"); priv_data.socket = socket; sap_peer_agent_accept_service_connection(peer_agent); - sap_peer_agent_set_service_connection_terminated_cb(peer_agent, conn_terminated, &priv_data); + sap_peer_agent_set_service_connection_terminated_cb(peer_agent, _on_connection_terminated, &priv_data); sap_socket_set_data_received_cb(socket, on_data_received, peer_agent); break; case SAP_CONNECTION_ALREADY_EXIST: @@ -1062,7 +1065,7 @@ _on_service_connection_created(sap_peer_agent_h peer_agent, { case SAP_CONNECTION_SUCCESS: sap_peer_agent_set_service_connection_terminated_cb(priv->peer_agent, - conn_terminated, + _on_connection_terminated, priv); sap_socket_set_data_received_cb(socket, on_data_received, peer_agent); -- 2.7.4