fix build warning

Change-Id: I84c7ee3d402fb591b7692bd596b470a0117a918a

diff --git a/client/net_nfc_client_llcp.c b/client/net_nfc_client_llcp.c
index 3e0c15abf9bed19aa0ee2f1dd1cf497d65d81a14..8537024a591dea7df04ef71514fb8a38e5526ae3 100644 (file)
--- a/client/net_nfc_client_llcp.c
+++ b/client/net_nfc_client_llcp.c
@@ -194,9 +194,6 @@ static void llcp_call_listen(GObject *source_object,
        net_nfc_error_e result;
        guint32 out_client_socket;
        GError *error = NULL;
-
-       guint32 out_oal_socket;
-
        net_nfc_llcp_internal_socket_s *socket_data = NULL;
 
        g_assert(func_data != NULL);
@@ -223,8 +220,6 @@ static void llcp_call_listen(GObject *source_object,
                return;
        }
 
-       socket_data->oal_socket = out_oal_socket;
-
        if (func_data->callback != NULL)
        {
                net_nfc_client_llcp_listen_completed callback =
@@ -315,9 +310,6 @@ static void llcp_call_connect(GObject *source_object,
        net_nfc_error_e result;
        guint32 out_client_socket;
        GError *error = NULL;
-
-       guint32 out_oal_socket;
-
        net_nfc_llcp_internal_socket_s *socket_data = NULL;
 
        g_assert(func_data != NULL);
@@ -343,8 +335,6 @@ static void llcp_call_connect(GObject *source_object,
                return;
        }
 
-       socket_data->oal_socket = out_oal_socket;
-
        if (func_data->callback != NULL)
        {
                net_nfc_client_llcp_connect_completed callback =
@@ -365,9 +355,6 @@ static void llcp_call_connect_sap(GObject *source_object,
        net_nfc_error_e result;
        guint32 out_client_socket;
        GError *error = NULL;
-
-       guint32 out_oal_socket;
-
        net_nfc_llcp_internal_socket_s *socket_data = NULL;
 
        g_assert(func_data != NULL);
@@ -392,8 +379,6 @@ static void llcp_call_connect_sap(GObject *source_object,
                return;
        }
 
-       socket_data->oal_socket = out_oal_socket;
-
        if (func_data->callback != NULL)
        {
                net_nfc_client_llcp_connect_sap_completed callback =

diff --git a/common/include/net_nfc_typedef_internal.h b/common/include/net_nfc_typedef_internal.h
index b7d70908b8d91ee095bf74695d6779ef9d15fed2..b495a890d377600359891cada5ae3963e3d48ee9 100644 (file)
--- a/common/include/net_nfc_typedef_internal.h
+++ b/common/include/net_nfc_typedef_internal.h
@@ -26,8 +26,8 @@ typedef enum
 } net_nfc_detect_mode_e;
 
 /**
- This structure is just data, to express bytes array
- */
+  This structure is just data, to express bytes array
+  */
 typedef struct _data_s
 {
        uint8_t *buffer;
@@ -86,7 +86,6 @@ typedef struct _net_nfc_llcp_internal_socket_s
        uint16_t miu; /** The remote Maximum Information Unit */
        uint8_t rw; /** The Receive Window size (4 bits)*/
        net_nfc_socket_type_e type;
-       net_nfc_llcp_socket_t oal_socket;
        net_nfc_llcp_socket_t client_socket;
        sap_t sap;
        uint8_t *service_name;
@@ -97,8 +96,8 @@ typedef struct _net_nfc_llcp_internal_socket_s
 } net_nfc_llcp_internal_socket_s;
 
 /**
- ndef_record_s structure has the NDEF record data. it is only a record not a message
- */
+  ndef_record_s structure has the NDEF record data. it is only a record not a message
+  */
 typedef struct _record_s
 {
        uint8_t MB :1;
@@ -114,8 +113,8 @@ typedef struct _record_s
 } ndef_record_s;
 
 /**
- NDEF message it has record counts and records (linked listed form)
- */
+  NDEF message it has record counts and records (linked listed form)
+  */
 typedef struct _ndef_message_s
 {
        uint32_t recordCount;
@@ -123,8 +122,8 @@ typedef struct _ndef_message_s
 } ndef_message_s;
 
 /**
- Enum value to stop or start the discovery mode
- */
+  Enum value to stop or start the discovery mode
+  */
 
 #define NET_NFC_MAX_UID_LENGTH            0x0AU       /**< Maximum UID length expected */
 #define NET_NFC_MAX_ATR_LENGTH            0x30U       /**< Maximum ATR_RES (General Bytes) */
@@ -288,9 +287,9 @@ typedef enum net_nfc_eDataRate_t
 typedef struct _net_nfc_sNfcIPInfo_t
 {
        /* Contains the random NFCID3I conveyed with the ATR_REQ.
-        always 10 bytes length
-        or contains the random NFCID3T conveyed with the ATR_RES.
-        always 10 bytes length */
+          always 10 bytes length
+          or contains the random NFCID3T conveyed with the ATR_RES.
+          always 10 bytes length */
        uint8_t NFCID[NET_NFC_MAX_UID_LENGTH];
        uint8_t NFCID_Length;
        /* ATR_RES = General bytes length, Max length = 48 bytes */
@@ -404,7 +403,7 @@ typedef struct _net_nfc_request_msg_t
 
 typedef struct _net_nfc_request_target_detected_t
 {
-       NET_NFC_REQUEST_MSG_HEADER
+       NET_NFC_REQUEST_MSG_HEADER;
 
        net_nfc_target_handle_s *handle;
        uint32_t devType;
@@ -414,7 +413,7 @@ typedef struct _net_nfc_request_target_detected_t
 
 typedef struct _net_nfc_request_se_event_t
 {
-       NET_NFC_REQUEST_MSG_HEADER
+       NET_NFC_REQUEST_MSG_HEADER;
 
        data_s aid;
        data_s param;
@@ -422,7 +421,7 @@ typedef struct _net_nfc_request_se_event_t
 
 typedef struct _net_nfc_request_llcp_msg_t
 {
-       NET_NFC_REQUEST_MSG_HEADER
+       NET_NFC_REQUEST_MSG_HEADER;
 
        uint32_t result;
        net_nfc_llcp_socket_t llcp_socket;
@@ -430,7 +429,7 @@ typedef struct _net_nfc_request_llcp_msg_t
 
 typedef struct _net_nfc_request_listen_socket_t
 {
-       NET_NFC_REQUEST_MSG_HEADER
+       NET_NFC_REQUEST_MSG_HEADER;
 
        uint32_t result;
        net_nfc_target_handle_s *handle;
@@ -446,7 +445,7 @@ typedef struct _net_nfc_request_listen_socket_t
 
 typedef struct _net_nfc_request_receive_socket_t
 {
-       NET_NFC_REQUEST_MSG_HEADER
+       NET_NFC_REQUEST_MSG_HEADER;
 
        uint32_t result;
        net_nfc_target_handle_s *handle;
@@ -459,7 +458,7 @@ typedef struct _net_nfc_request_receive_socket_t
 
 typedef struct _net_nfc_request_receive_from_socket_t
 {
-       NET_NFC_REQUEST_MSG_HEADER
+       NET_NFC_REQUEST_MSG_HEADER;
 
        uint32_t result;
        net_nfc_target_handle_s *handle;
@@ -635,7 +634,7 @@ __attribute__((packed)) net_nfc_certificate_chain_s;
 #define URI_SCHEM_FILE "file://"
 
 typedef void (*net_nfc_service_llcp_cb)(net_nfc_llcp_socket_t socket,
-       net_nfc_error_e result, data_s *data, void *extra, void *user_param);
+               net_nfc_error_e result, data_s *data, void *extra, void *user_param);
 
 typedef struct _net_nfc_llcp_param_t
 {

diff --git a/common/net_nfc_util_handover.c b/common/net_nfc_util_handover.c
index 24374e4ae25c857b4e5f9b318d808be15470b4a8..f3a292fe7cde3b48d3d8dc5140f4b983cf42906e 100755 (executable)
--- a/common/net_nfc_util_handover.c
+++ b/common/net_nfc_util_handover.c
@@ -903,7 +903,7 @@ net_nfc_error_e net_nfc_util_create_handover_carrier_record(ndef_record_s ** rec
        buffer_ptr[1] = strlen(CONN_HANDOVER_WIFI_BSS_CARRIER_MIME_NAME);
 
        //copy the MIME
-       memcpy(buffer_ptr[2],CONN_HANDOVER_WIFI_BSS_CARRIER_MIME_NAME,(payload.buffer)[1]);
+       memcpy(&buffer_ptr[2],CONN_HANDOVER_WIFI_BSS_CARRIER_MIME_NAME,(payload.buffer)[1]);
        payload.buffer[25] = '\0';
 
        payload.length =26;
@@ -1552,7 +1552,7 @@ net_nfc_error_e net_nfc_util_get_alternative_carrier_type_from_record(ndef_recor
                        {
                                *type = NET_NFC_CONN_HANDOVER_CARRIER_UNKNOWN;
                        }
-               break;
+                       break;
                case NET_NFC_RECORD_WELL_KNOWN_TYPE:    /* NFC Forum Well-known Type*/
                case NET_NFC_RECORD_URI:                                /* Absolute URIs as defined in [RFC 3986] */
                case NET_NFC_RECORD_EXTERNAL_RTD:               /* NFC Forum external type */

diff --git a/daemon/net_nfc_server_handover_bss.h b/daemon/net_nfc_server_handover_bss.h
index 16638f5db17d03adced4e02988cd4f7d9d176e54..33fbe176f869fdd9ffa330639f62b1d3fd552c46 100755 (executable)
--- a/daemon/net_nfc_server_handover_bss.h
+++ b/daemon/net_nfc_server_handover_bss.h
@@ -15,19 +15,14 @@
  */
 #ifndef __NET_NFC_SERVER_HANDOVER_BSS_H__
 #define __NET_NFC_SERVER_HANDOVER_BSS_H__
-#include <gio/gio.h>
+
 #include <wifi.h>
 #ifdef TARGET
 #include <wifi-direct.h>
 #endif
-#include "net_nfc_debug_internal.h"
+
 #include "net_nfc_typedef_internal.h"
-#include "net_nfc_util_internal.h"
-#include "net_nfc_util_ndef_message.h"
-#include "net_nfc_util_ndef_record.h"
-#include "net_nfc_util_handover.h"
 #include "net_nfc_server_handover_bt.h"
-#include "net_nfc_server_llcp.h"
 
 typedef struct _net_nfc_handover_bss_process_context_t
 {

diff --git a/daemon/net_nfc_server_llcp.c b/daemon/net_nfc_server_llcp.c
index 9e1f5198aa109968711808c3442a1f490806d1b0..8d85311c470f14c9981e4be7928b4ec6d7f21360 100644 (file)
--- a/daemon/net_nfc_server_llcp.c
+++ b/daemon/net_nfc_server_llcp.c
@@ -2683,19 +2683,20 @@ static void net_nfc_server_llcp_process(gpointer user_data)
        net_nfc_current_target_info_s *target;
 #if 0
        net_nfc_error_e result;
+       net_nfc_target_type_e dev_type;
 #endif
        net_nfc_target_handle_s *handle;
-       net_nfc_target_type_e dev_type;
 
        target = net_nfc_server_get_target_info();
 
        g_assert(target != NULL); /* raise exception!!! what;s wrong?? */
 
        handle = target->handle;
-       dev_type = target->devType;
 
        DEBUG_SERVER_MSG("connection type = [%d]", handle->connection_type);
 #if 0
+       dev_type = target->devType;
+
        if (dev_type == NET_NFC_NFCIP1_TARGET)
        {
                DEBUG_SERVER_MSG("LLCP : target, try to connect");

diff --git a/daemon/net_nfc_server_p2p.c b/daemon/net_nfc_server_p2p.c
index 9a4e4dea44128a02782efa3877577e7ce3324248..12f64ec1ac706a56ab13c5cf7b416afb4f8af911 100644 (file)
--- a/daemon/net_nfc_server_p2p.c
+++ b/daemon/net_nfc_server_p2p.c
@@ -61,12 +61,8 @@ static void p2p_send_data_thread_func(gpointer user_data)
 
        handle = GUINT_TO_POINTER(p2p_data->p2p_handle);
 
-       result = net_nfc_server_snep_default_client_start(
-                       GUINT_TO_POINTER(p2p_data->p2p_handle),
-                       SNEP_REQ_PUT,
-                       &p2p_data->data,
-                       -1,
-                       p2p_data);
+       result = net_nfc_server_snep_default_client_start(handle, SNEP_REQ_PUT,
+                       &p2p_data->data, -1, p2p_data);
        if (result != NET_NFC_OK)
        {
                net_nfc_gdbus_p2p_complete_send(p2p_data->p2p,

diff --git a/tests/net_nfc_test_snep.c b/tests/net_nfc_test_snep.c
index e21e9d4965e6767ae36304963bcb560dd2faa760..7cf62a0ebad78e8c329deb41cf59d34daa0f252b 100644 (file)
--- a/tests/net_nfc_test_snep.c
+++ b/tests/net_nfc_test_snep.c
@@ -61,12 +61,6 @@ static void snep_send_request_cb(net_nfc_snep_handle_h target,
                void *user_data);
 
 
-static void snep_register_server_cb(net_nfc_snep_handle_h target,
-               net_nfc_llcp_state_t state,
-               net_nfc_error_e result,
-               ndef_message_h msg,
-               void *user_data);
-
 /******************************Callbacks*********************************************/
 
 
@@ -155,12 +149,14 @@ static void snep_send_request_cb(net_nfc_snep_handle_h target,
 }
 
 
-static void snep_register_server_cb(net_nfc_snep_handle_h target,
-               net_nfc_llcp_state_t state,
+static void snep_register_server_cb(
+               net_nfc_snep_handle_h target,
+               net_nfc_snep_type_t event,
                net_nfc_error_e result,
                ndef_message_h msg,
                void *user_data)
 {
+       net_nfc_llcp_state_t state = event;
 
        g_print("snep_register_server_cb Completed %d\n", state);
        g_print("snep_register_server_cb Completed %d\n", result);