From: sinikang Date: Fri, 13 Oct 2017 06:00:05 +0000 (+0900) Subject: Fix parse warnings X-Git-Tag: submit/tizen/20171016.065339^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F155409%2F1;p=platform%2Fcore%2Ftelephony%2Ftel-plugin-dbus_tapi.git Fix parse warnings - CID 28245, 44557 Change-Id: I4b2482864a31a3a6d6f5e40818cf95913f0fd25a --- diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec index c4c6fea..a6fa6d2 100644 --- a/packaging/tel-plugin-dbus_tapi.spec +++ b/packaging/tel-plugin-dbus_tapi.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 3 -%define patchlevel 90 +%define patchlevel 91 Name: tel-plugin-dbus_tapi Version: %{major}.%{minor}.%{patchlevel} diff --git a/src/dtapi_sat_manager.c b/src/dtapi_sat_manager.c index c17dd97..3b8a814 100644 --- a/src/dtapi_sat_manager.c +++ b/src/dtapi_sat_manager.c @@ -5172,7 +5172,7 @@ static gboolean _sat_manager_handle_setup_call_confirm(struct custom_data *ctx, TelephonyObjectSkeleton *object; const gchar *cp_name; GVariant *setup_call = NULL; - gint command_id, call_type, confirmed_text_len, text_len, duration; + gint cmd_id, call_type, confirmed_text_len, text_len, duration; gchar *confirmed_text = NULL, *text = NULL, *call_number = NULL; #if defined(TIZEN_SUPPORT_SAT_ICON) GVariant *icon_id; @@ -5202,19 +5202,19 @@ static gboolean _sat_manager_handle_setup_call_confirm(struct custom_data *ctx, dbg("setup call type_format(%s)", g_variant_get_type_string(setup_call)); #if defined(TIZEN_SUPPORT_SAT_ICON) - g_variant_get(setup_call, "(isisi@visi)", &command_id, + g_variant_get(setup_call, "(isisi@visi)", &cmd_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &icon_id, &call_type, &call_number, &duration); - telephony_sat_emit_setup_call(sat, command_id, confirmed_text, + telephony_sat_emit_setup_call(sat, cmd_id, confirmed_text, confirmed_text_len, text, text_len, icon_id, call_type, call_number, duration); #else - g_variant_get(setup_call, "(isisiisi)", &command_id, + g_variant_get(setup_call, "(isisiisi)", &cmd_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &call_type, &call_number, &duration); - telephony_sat_emit_setup_call(sat, command_id, confirmed_text, + telephony_sat_emit_setup_call(sat, cmd_id, confirmed_text, confirmed_text_len, text, text_len, call_type, call_number, duration); #endif @@ -5349,7 +5349,7 @@ static gboolean _sat_manager_handle_launch_browser_confirm(struct custom_data *c const gchar *cp_name; GVariant *launch_browser = NULL; - gint command_id = 0; + gint cmd_id = 0; gint browser_launch_type = 0, browser_id = 0; gint url_len = 0, text_len = 0, gateway_proxy_len = 0; gchar *url = NULL; @@ -5383,13 +5383,13 @@ static gboolean _sat_manager_handle_launch_browser_confirm(struct custom_data *c dbg("launch_browser type_format(%s)", g_variant_get_type_string(launch_browser)); #if defined(TIZEN_SUPPORT_SAT_ICON) - g_variant_get(launch_browser, "(iiisisisi@v)", &command_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len, &icon_id); + g_variant_get(launch_browser, "(iiisisisi@v)", &cmd_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len, &icon_id); - telephony_sat_emit_launch_browser(sat, command_id, browser_launch_type, browser_id, url, url_len, gateway_proxy, gateway_proxy_len, text, text_len, icon_id); + telephony_sat_emit_launch_browser(sat, cmd_id, browser_launch_type, browser_id, url, url_len, gateway_proxy, gateway_proxy_len, text, text_len, icon_id); #else - g_variant_get(launch_browser, "(iiisisisi)", &command_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len); + g_variant_get(launch_browser, "(iiisisisi)", &cmd_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len); - telephony_sat_emit_launch_browser(sat, command_id, browser_launch_type, browser_id, url, url_len, gateway_proxy, gateway_proxy_len, text, text_len); + telephony_sat_emit_launch_browser(sat, cmd_id, browser_launch_type, browser_id, url, url_len, gateway_proxy, gateway_proxy_len, text, text_len); #endif g_free(url); g_free(text); @@ -5466,7 +5466,7 @@ static gboolean _sat_manager_handle_open_channel_confirm(struct custom_data *ctx TelephonyObjectSkeleton *object; const gchar *cp_name; GVariant *open_channel = NULL; - gint command_id, bearer_type, protocol_type, dest_addr_type; + gint cmd_id, bearer_type, protocol_type, dest_addr_type; gboolean immediate_link, auto_reconnection, bg_mode; gint text_len, buffer_size, port_number; gchar *text = NULL, *dest_address = NULL; @@ -5499,12 +5499,12 @@ static gboolean _sat_manager_handle_open_channel_confirm(struct custom_data *ctx dbg("open channel type_format(%s)", g_variant_get_type_string(open_channel)); #if defined(TIZEN_SUPPORT_SAT_ICON) - g_variant_get(open_channel, "(isi@vbbbi@viiiis@v)", &command_id, + g_variant_get(open_channel, "(isi@vbbbi@viiiis@v)", &cmd_id, &text, &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode, &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail); #else - g_variant_get(open_channel, "(isibbbi@viiiis@v)", &command_id, + g_variant_get(open_channel, "(isibbbi@viiiis@v)", &cmd_id, &text, &text_len, &immediate_link, &auto_reconnection, &bg_mode, &bearer_type, &bearer_param, &buffer_size, &protocol_type, &port_number, &dest_addr_type, &dest_address, &bearer_detail);