Fixed build errors. 81/191081/2 submit/tizen/20181012.023348
authorsaerome.kim <saerome.kim@samsung.com>
Thu, 11 Oct 2018 07:31:10 +0000 (16:31 +0900)
committersaerome.kim <saerome.kim@samsung.com>
Thu, 11 Oct 2018 07:47:01 +0000 (16:47 +0900)
Recently, as the gcc is version-up, there is a problem in judging
the casting which were as normal at previous time as an error.
So, change previouse one align with new rules.

Change-Id: Ic9e41feba0fe2b6ccbb48f30a37329a6dd0bae35
Signed-off-by: saerome.kim <saerome.kim@samsung.com>
79 files changed:
packaging/nfc-manager.service [changed mode: 0755->0644]
packaging/nfc-manager.socket [changed mode: 0755->0644]
packaging/nfc-manager.spec [changed mode: 0755->0644]
src/commonlib/CMakeLists.txt [changed mode: 0755->0644]
src/commonlib/include/net_nfc_debug_internal.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_oem_controller.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_typedef.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_typedef_internal.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_util_defines.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_util_handover.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_util_handover_internal.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_util_internal.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_util_ndef_message.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_util_ndef_record.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_util_openssl_internal.h [changed mode: 0755->0644]
src/commonlib/include/net_nfc_util_sign_record.h [changed mode: 0755->0644]
src/commonlib/net_nfc.xml [changed mode: 0755->0644]
src/commonlib/net_nfc_util.c [changed mode: 0755->0644]
src/commonlib/net_nfc_util_gdbus.c [changed mode: 0755->0644]
src/commonlib/net_nfc_util_handover.c [changed mode: 0755->0644]
src/commonlib/net_nfc_util_hce.c [changed mode: 0755->0644]
src/commonlib/net_nfc_util_ndef_message.c [changed mode: 0755->0644]
src/commonlib/net_nfc_util_ndef_record.c [changed mode: 0755->0644]
src/commonlib/net_nfc_util_openssl.c [changed mode: 0755->0644]
src/commonlib/nfc-common-lib.pc.in [changed mode: 0755->0644]
src/manager/CMakeLists.txt [changed mode: 0755->0644]
src/manager/addons/include/net_nfc_addon_hce.h [changed mode: 0755->0644]
src/manager/addons/include/net_nfc_addons.h [changed mode: 0755->0644]
src/manager/addons/net_nfc_addon_hce.c [changed mode: 0755->0644]
src/manager/addons/net_nfc_addon_hce_ndef.c [changed mode: 0755->0644]
src/manager/addons/net_nfc_addon_hce_ppse.c [changed mode: 0755->0644]
src/manager/addons/net_nfc_addons.c [changed mode: 0755->0644]
src/manager/include/net_nfc_app_util_internal.h [changed mode: 0755->0644]
src/manager/include/net_nfc_controller_internal.h [changed mode: 0755->0644]
src/manager/include/net_nfc_manager.h [changed mode: 0755->0644]
src/manager/include/net_nfc_manager_util_internal.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_addon.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_common.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_context_internal.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_handover.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_handover_internal.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_hce.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_hce_ipc.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_manager.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_process_handover.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_process_snep.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_route_table.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_tag.h [changed mode: 0755->0644]
src/manager/include/net_nfc_server_vconf.h [changed mode: 0755->0644]
src/manager/net_nfc_app_util.c [changed mode: 0755->0644]
src/manager/net_nfc_controller.c [changed mode: 0755->0644]
src/manager/net_nfc_manager.c [changed mode: 0755->0644]
src/manager/net_nfc_manager_util.c [changed mode: 0755->0644]
src/manager/net_nfc_server.c [changed mode: 0755->0644]
src/manager/net_nfc_server_common.c [changed mode: 0755->0644]
src/manager/net_nfc_server_context.c [changed mode: 0755->0644]
src/manager/net_nfc_server_handover.c [changed mode: 0755->0644]
src/manager/net_nfc_server_handover_bt.c [changed mode: 0755->0644]
src/manager/net_nfc_server_handover_wfd.c [changed mode: 0755->0644]
src/manager/net_nfc_server_handover_wps.c [changed mode: 0755->0644]
src/manager/net_nfc_server_hce.c [changed mode: 0755->0644]
src/manager/net_nfc_server_hce_ipc.c [changed mode: 0755->0644]
src/manager/net_nfc_server_llcp.c [changed mode: 0755->0644]
src/manager/net_nfc_server_manager.c [changed mode: 0755->0644]
src/manager/net_nfc_server_ndef.c [changed mode: 0755->0644]
src/manager/net_nfc_server_p2p.c [changed mode: 0755->0644]
src/manager/net_nfc_server_process_handover.c [changed mode: 0755->0644]
src/manager/net_nfc_server_process_npp.c [changed mode: 0755->0644]
src/manager/net_nfc_server_process_snep.c [changed mode: 0755->0644]
src/manager/net_nfc_server_route_table.c [changed mode: 0755->0644]
src/manager/net_nfc_server_se.c [changed mode: 0755->0644]
src/manager/net_nfc_server_snep.c [changed mode: 0755->0644]
src/manager/net_nfc_server_system_handler.c [changed mode: 0755->0644]
src/manager/net_nfc_server_tag.c [changed mode: 0755->0644]
src/manager/net_nfc_server_test.c [changed mode: 0755->0644]
src/manager/net_nfc_server_transceive.c [changed mode: 0755->0644]
src/manager/net_nfc_server_vconf.c [changed mode: 0755->0644]
src/manager/org.tizen.NetNfcService.service [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 360a3d5..28f4496
@@ -1,6 +1,6 @@
 Name:       nfc-manager
 Summary:    NFC framework manager
-Version:    0.1.177
+Version:    0.1.178
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Flora-1.1
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 2e23703..cf2e8fb
@@ -360,7 +360,7 @@ static GHashTable *handle_table;
 
 static void *_get_memory_address(uint32_t handle)
 {
-       return g_hash_table_lookup(handle_table, (gconstpointer) handle);
+       return g_hash_table_lookup(handle_table, GUINT_TO_POINTER(handle));
 }
 
 uint32_t net_nfc_util_create_memory_handle(void *address)
@@ -372,7 +372,7 @@ uint32_t net_nfc_util_create_memory_handle(void *address)
 
        g_assert(g_hash_table_size(handle_table) < MAX_HANDLE);
 
-       g_hash_table_insert(handle_table, (gpointer) next_handle, (gpointer) address);
+       g_hash_table_insert(handle_table, GUINT_TO_POINTER(next_handle), (gpointer) address);
 
        handle = next_handle;
 
@@ -401,7 +401,7 @@ void net_nfc_util_destroy_memory_handle(uint32_t handle)
        if (handle_table == NULL || handle == 0 || handle > MAX_HANDLE)
                return;
 
-       g_hash_table_remove(handle_table, (gconstpointer) handle);
+       g_hash_table_remove(handle_table, GUINT_TO_POINTER(handle));
 }
 
 #define IS_HEX(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'A' && (c) <= 'F') || \
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index a37cb59..4778489
@@ -36,7 +36,7 @@ static gboolean _find_by_attribute_cb(GNode * node, gpointer data)
        gpointer *temp = data;
        gboolean result;
 
-       if (prop != NULL && prop->attribute == (uint16_t) (uint32_t) temp[0]) {
+       if (prop != NULL && prop->attribute == (uint16_t) GPOINTER_TO_UINT(temp[0])) {
                temp[1] = node;
 
                result = true;
@@ -51,7 +51,7 @@ static GNode *__find_property_by_attribute(GNode * list, uint16_t attribute)
 {
        gpointer context[2];
 
-       context[0] = (gpointer) (uint32_t) attribute;
+       context[0] = GUINT_TO_POINTER(attribute);
        context[1] = NULL;
 
        g_node_traverse(list, G_IN_ORDER, G_TRAVERSE_ALL, -1, _find_by_attribute_cb, context);
old mode 100755 (executable)
new mode 100644 (file)
index 41fc051..678361c
@@ -113,7 +113,7 @@ net_nfc_error_e net_nfc_util_hce_extract_parameter(data_s * apdu, net_nfc_apdu_d
                                        result = NET_NFC_OK;
                                }
                        } else {
-                               DEBUG_ERR_MSG("l == len || l + 1 == len, [%d/%d]", apdu->length, l);
+                               DEBUG_ERR_MSG("l == len || l + 1 == len, [%d/%zu]", apdu->length, l);
 
                                result = NET_NFC_INVALID_PARAM;
                        }
@@ -125,7 +125,7 @@ net_nfc_error_e net_nfc_util_hce_extract_parameter(data_s * apdu, net_nfc_apdu_d
        } else if (apdu->length == l) {
                result = NET_NFC_OK;
        } else {
-               DEBUG_ERR_MSG("len > l, [%d/%d]", apdu->length, l);
+               DEBUG_ERR_MSG("len > l, [%d/%zu]", apdu->length, l);
 
                result = NET_NFC_INVALID_PARAM;
        }
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 8971b19..04a92a6
@@ -137,7 +137,7 @@ net_nfc_openssl_verify_context_s *net_nfc_util_openssl_init_verify_certificate(v
                else
                        DEBUG_ERR_MSG("X509_STORE_new failed");
        } else {
-               DEBUG_ERR_MSG("alloc failed [%d]", sizeof(net_nfc_openssl_verify_context_s));
+               DEBUG_ERR_MSG("alloc failed [%zu]", sizeof(net_nfc_openssl_verify_context_s));
        }
 
        return result;
@@ -441,7 +441,7 @@ int net_nfc_util_openssl_sign_buffer(uint32_t type, uint8_t * buffer, uint32_t l
                return result;
        }
 
-       if (!EVP_DigestSignFinal(&ctx, sign, sign_len)) {
+       if (!EVP_DigestSignFinal(&ctx, sign, (size_t *)sign_len)) {
                result = -1;
                return result;
        }
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index b6aee70..3ec68eb
@@ -506,7 +506,7 @@ static bool _net_nfc_app_util_get_mime_from_record(ndef_record_s * record, char
                                snprintf(mime, length, "U/0x%02x", record->payload_s.buffer[0]);
                        } else {
                                if (length < record->type_s.length + 4) {
-                                       DEBUG_ERR_MSG("mime Data Error: mime[%d], record[%d]+4", length, record->type_s.length);
+                                       DEBUG_ERR_MSG("mime Data Error: mime[%zu], record[%d]+4", length, record->type_s.length);
                                        break;
                                }
                                memcpy(mime, record->type_s.buffer, record->type_s.length);
old mode 100755 (executable)
new mode 100644 (file)
index 0bed88b..f5ee739
@@ -516,7 +516,7 @@ static gint _compare_socket_info(gconstpointer a, gconstpointer b)
        int result;
        socket_info_t *info = (socket_info_t *) a;
 
-       if (info->socket == (net_nfc_llcp_socket_t) b)
+       if (info->socket == (net_nfc_llcp_socket_t)GPOINTER_TO_UINT(b))
                result = 0;
        else
                result = -1;
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index d56bc40..234ed1e
@@ -302,7 +302,7 @@ void net_nfc_server_gdbus_add_client_context(const char *id, client_state_e stat
 
                        g_hash_table_insert(client_contexts, (gpointer) g_strdup(id), (gpointer) info);
 
-                       DEBUG_SERVER_MSG("current client count = [%d]", net_nfc_server_gdbus_get_client_count_no_lock());
+                       DEBUG_SERVER_MSG("current client count = [%zu]", net_nfc_server_gdbus_get_client_count_no_lock());
                } else {
                        DEBUG_ERR_MSG("alloc failed");
                }
@@ -325,7 +325,7 @@ void net_nfc_server_gdbus_cleanup_client_context(const char *id)
 
                g_hash_table_remove(client_contexts, id);
 
-               DEBUG_SERVER_MSG("current client count = [%d]", net_nfc_server_gdbus_get_client_count_no_lock());
+               DEBUG_SERVER_MSG("current client count = [%zu]", net_nfc_server_gdbus_get_client_count_no_lock());
 
                net_nfc_server_route_table_unset_preferred_handler_by_id(id);
 
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 7b9ad2e..eb1f180
@@ -610,7 +610,7 @@ static gboolean hce_handle_response_apdu(NetNfcGDbusHce * object, GDBusMethodInv
 
        data->object = g_object_ref(object);
        data->invocation = g_object_ref(invocation);
-       data->handle = (net_nfc_target_handle_s *) arg_handle;
+       data->handle = (net_nfc_target_handle_s *) GUINT_TO_POINTER(arg_handle);
        data->data = g_variant_ref(apdudata);
 
        if (net_nfc_server_controller_async_queue_push_force(hce_response_apdu_thread_func, data) == FALSE) {
@@ -728,7 +728,7 @@ static bool __extract_parameter(apdu_header_t * apdu, size_t len, uint16_t * lc,
 
                                result = true;
                        } else {
-                               DEBUG_ERR_MSG("l == len || l + 1 == len, [%d/%d]", len, l);
+                               DEBUG_ERR_MSG("l == len || l + 1 == len, [%zu/%zu]", len, l);
 
                                result = false;
                        }
@@ -740,7 +740,7 @@ static bool __extract_parameter(apdu_header_t * apdu, size_t len, uint16_t * lc,
        } else if (len == l) {
                result = true;
        } else {
-               DEBUG_ERR_MSG("len > l, [%d/%d]", len, l);
+               DEBUG_ERR_MSG("len > l, [%zu/%zu]", len, l);
 
                result = false;
        }
@@ -847,7 +847,7 @@ static void hce_apdu_thread_func(gpointer user_data)
        net_nfc_server_route_table_update_preferred_handler();
 
        if (data->event == NET_NFC_MESSAGE_ROUTING_HOST_EMU_DATA) {
-               DEBUG_SERVER_MSG("[HCE] Command arrived, handle [0x%x], len [%d]", (int)data->handle, data->apdu.length);
+               DEBUG_SERVER_MSG("[HCE] Command arrived, handle [0x%p], len [%d]", data->handle, data->apdu.length);
 
                if (__pre_process_apdu(data->handle, &data->apdu) == false) {
                        /* finished */
@@ -923,7 +923,7 @@ static void hce_apdu_thread_func(gpointer user_data)
                        DEBUG_SERVER_MSG("pre-processed data");
                }
        } else {
-               SECURE_MSG("[HCE] %s!!!!, handle [0x%x]", data->event == NET_NFC_MESSAGE_ROUTING_HOST_EMU_ACTIVATED ? "Activated" : "Deactivated", (int)data->handle);
+               SECURE_MSG("[HCE] %s!!!!, handle [0x%p]", data->event == NET_NFC_MESSAGE_ROUTING_HOST_EMU_ACTIVATED ? "Activated" : "Deactivated", data->handle);
 
                _routing_table_iterate(_route_table_iter_cb, data);
 
old mode 100755 (executable)
new mode 100644 (file)
index 9265a1f..fe3e748
@@ -205,7 +205,7 @@ static bool __receive_data_from_client(int socket, data_s * data)
        /* first, receive length */
        ret = recv(socket, (void *)&len, sizeof(len), 0);
        if (ret != sizeof(len)) {
-               DEBUG_ERR_MSG("recv failed, socket [%d], result [%d]", socket, ret);
+               DEBUG_ERR_MSG("recv failed, socket [%d], result [%zd]", socket, ret);
 
                return false;
        }
@@ -236,7 +236,7 @@ static bool __receive_data_from_client(int socket, data_s * data)
 
                        result = false;
                } else {
-                       DEBUG_SERVER_MSG("recv success, length [%d]", offset);
+                       DEBUG_SERVER_MSG("recv success, length [%zd]", offset);
                }
        } else {
                DEBUG_ERR_MSG("net_nfc_util_init_data failed");
@@ -262,7 +262,7 @@ static bool __process_client_message(GIOChannel * channel)
                        temp.buffer = header->data;
                        temp.length = data.length - sizeof(net_nfc_hce_data_t);
 
-                       net_nfc_server_hce_handle_send_apdu_response((net_nfc_target_handle_s *) header->handle, &temp);
+                       net_nfc_server_hce_handle_send_apdu_response((net_nfc_target_handle_s *) (intptr_t)header->handle, &temp);
 
                        result = true;
                } else {
@@ -505,7 +505,7 @@ bool net_nfc_server_hce_send_to_client(const char *id, int type, net_nfc_target_
                header = (net_nfc_hce_data_t *) (temp.buffer + sizeof(len));
 
                header->type = type;
-               header->handle = (int)handle;
+               header->handle = (intptr_t)handle;
 
                if (data != NULL && data->length > 0)
                        memcpy(header->data, data->buffer, data->length);
@@ -540,7 +540,7 @@ bool net_nfc_server_hce_send_to_all_client(int type, net_nfc_target_handle_s * h
                header = (net_nfc_hce_data_t *) (temp.buffer + sizeof(len));
 
                header->type = type;
-               header->handle = (int)handle;
+               header->handle = (intptr_t)handle;
 
                if (data != NULL && data->length > 0)
                        memcpy(header->data, data->buffer, data->length);
old mode 100755 (executable)
new mode 100644 (file)
index 18c95ac..42b9d5d
@@ -394,7 +394,7 @@ static void llcp_receive_from_cb(net_nfc_llcp_socket_t socket, net_nfc_error_e r
        g_assert(llcp_data->invocation != NULL);
 
        variant = net_nfc_util_gdbus_data_to_variant(data);
-       net_nfc_gdbus_llcp_complete_receive_from(llcp_data->llcp, llcp_data->invocation, result, (guint8) (int)extra, variant);
+       net_nfc_gdbus_llcp_complete_receive_from(llcp_data->llcp, llcp_data->invocation, result, (guint8) (intptr_t)extra, variant);
 
        g_object_unref(llcp_data->invocation);
        g_object_unref(llcp_data->llcp);
@@ -464,7 +464,7 @@ static void llcp_handle_listen_thread_func(gpointer user_data)
 
        client_data->connection = g_dbus_method_invocation_get_connection(data->invocation);
        client_data->invocation = data->invocation;
-       client_data->handle = (net_nfc_target_handle_h) data->handle;
+       client_data->handle = (net_nfc_target_handle_h) (intptr_t)data->handle;
 
        if (net_nfc_controller_llcp_create_socket(&socket, data->type, data->miu, data->rw, &result, llcp_socket_error_cb, client_data) == false) {
                DEBUG_ERR_MSG("net_nfc_controller_llcp_create_socket failed [%d]", result);
@@ -530,7 +530,7 @@ static void llcp_handle_accept_thread_func(gpointer user_data)
 
        client_data->connection = g_dbus_method_invocation_get_connection(data->invocation);
        client_data->invocation = data->invocation;
-       client_data->handle = (net_nfc_target_handle_h) data->handle;
+       client_data->handle = (net_nfc_target_handle_h) (intptr_t)data->handle;
        client_data->socket = data->client_socket;
 
        if (net_nfc_controller_llcp_accept(data->client_socket, &result, llcp_socket_error_cb, client_data) == false) {
@@ -599,7 +599,7 @@ static void llcp_handle_connect_thread_func(gpointer user_data)
 
        client_data->connection = g_dbus_method_invocation_get_connection(data->invocation);
        client_data->invocation = data->invocation;
-       client_data->handle = (net_nfc_target_handle_h) data->handle;
+       client_data->handle = (net_nfc_target_handle_h) (intptr_t)data->handle;
 
        if (net_nfc_controller_llcp_create_socket(&socket, data->type, data->miu, data->rw, &result, llcp_socket_error_cb, client_data) == false) {
                DEBUG_ERR_MSG("net_nfc_controller_llcp_create_socket failed [%d]", result);
@@ -659,7 +659,7 @@ static void llcp_handle_connect_sap_thread_func(gpointer user_data)
 
        client_data->connection = g_dbus_method_invocation_get_connection(data->invocation);
        client_data->invocation = data->invocation;
-       client_data->handle = (net_nfc_target_handle_h) data->handle;
+       client_data->handle = (net_nfc_target_handle_h) (intptr_t)data->handle;
 
        if (net_nfc_controller_llcp_create_socket(&socket, data->type, data->miu, data->rw, &result, llcp_socket_error_cb, client_data) == false) {
                DEBUG_ERR_MSG("net_nfc_controller_llcp_create_socket failed [%d]", result);
@@ -1924,7 +1924,7 @@ static void _llcp_init()
 
 static inline service_t *_llcp_find_service(uint32_t sap)
 {
-       return (service_t *) g_hash_table_lookup(service_table, (gconstpointer) sap);
+       return (service_t *) g_hash_table_lookup(service_table, GUINT_TO_POINTER(sap));
 }
 
 static net_nfc_error_e _llcp_add_service(const char *id, uint32_t sap, const char *san, net_nfc_server_llcp_activate_cb cb, void *user_data)
@@ -1953,7 +1953,7 @@ static net_nfc_error_e _llcp_add_service(const char *id, uint32_t sap, const cha
                        service->cb = cb;
                        service->user_data = user_data;
 
-                       g_hash_table_insert(service_table, (gpointer) sap, (gpointer) service);
+                       g_hash_table_insert(service_table, GUINT_TO_POINTER(sap), service);
 
                        result = NET_NFC_OK;
                } else {
@@ -1981,7 +1981,7 @@ static void _llcp_remove_service(uint32_t sap)
                g_free(service->id);
                g_free(service);
 
-               g_hash_table_remove(service_table, (gconstpointer) sap);
+               g_hash_table_remove(service_table, GUINT_TO_POINTER(sap));
        }
 }
 
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 75ef765..7918973
@@ -147,7 +147,7 @@ static void __npp_server_received_cb(net_nfc_error_e result, net_nfc_target_hand
 //          /* start next entry */
 //      }
        } else {
-               DEBUG_SERVER_MSG("fragmented message, read [%d], expected [%d]", npp_data->data_offset, npp_data->data.length);
+               DEBUG_SERVER_MSG("fragmented message, read [%zd], expected [%d]", npp_data->data_offset, npp_data->data.length);
 
                /* receive next fragment */
                result = net_nfc_server_llcp_simple_receive(npp_data->handle, npp_data->socket, __npp_server_received_cb, npp_data);
@@ -232,7 +232,7 @@ static void npp_server_receive_cb(net_nfc_error_e result, net_nfc_target_handle_
 
                length = htonl(entry->length);
 
-               DEBUG_SERVER_MSG("action code [0x%02x], length [%d]", entry->op, length);
+               DEBUG_SERVER_MSG("action code [0x%02x], length [%zd]", entry->op, length);
 
                if (length > 0) {
                        data_s temp;
@@ -331,7 +331,7 @@ static void npp_client_send_cb(net_nfc_error_e result, net_nfc_target_handle_s *
                return;
 
        if (npp_data->data_offset < npp_data->data.length) {
-               DEBUG_SERVER_MSG("fragmented message, sent [%d], total [%d]", npp_data->data_offset, npp_data->data.length);
+               DEBUG_SERVER_MSG("fragmented message, sent [%zd], total [%d]", npp_data->data_offset, npp_data->data.length);
 
                npp_client_process(npp_data);
        } else {
old mode 100755 (executable)
new mode 100644 (file)
index 97ecd27..90981b8
@@ -1321,7 +1321,7 @@ static net_nfc_error_e _net_nfc_server_default_server_cb_(net_nfc_snep_handle_h
                        uint32_t max_len = htonl(msg->length);
                        data_s get_msg = { msg->data, data->length - sizeof(msg->length) };
 
-                       DEBUG_SERVER_MSG("GET : acceptable max_len [%d], message [%d]", max_len, data->length - sizeof(msg->length));
+                       DEBUG_SERVER_MSG("GET : acceptable max_len [%d], message [%zd]", max_len, data->length - sizeof(msg->length));
 
                        if (_net_nfc_server_snep_process_get_response_cb(handle, &get_msg, max_len))
                                result = NET_NFC_OK;
@@ -1526,7 +1526,7 @@ net_nfc_error_e net_nfc_server_snep_parse_get_request(data_s * request, size_t *
        message->buffer = msg->data;
        message->length = request->length - sizeof(msg->length);
 
-       DEBUG_SERVER_MSG("GET : acceptable max_len [%d], message [%d]", *max_len, request->length - sizeof(msg->length));
+       DEBUG_SERVER_MSG("GET : acceptable max_len [%zu], message [%zd]", *max_len, request->length - sizeof(msg->length));
 
        return NET_NFC_OK;
 }
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 8cdd775..6207114
@@ -891,7 +891,7 @@ static gboolean se_handle_close_secure_element(NetNfcGDbusSecureElement * object
 
        data->object = g_object_ref(object);
        data->invocation = g_object_ref(invocation);
-       data->handle = (net_nfc_target_handle_s *) arg_handle;
+       data->handle = (net_nfc_target_handle_s *) (intptr_t)arg_handle;
 
        if (net_nfc_server_controller_async_queue_push_force(se_close_secure_element_thread_func, data) == FALSE) {
                /* return error if queue was blocked */
@@ -978,7 +978,7 @@ static gboolean se_handle_get_atr(NetNfcGDbusSecureElement * object, GDBusMethod
 
        data->object = g_object_ref(object);
        data->invocation = g_object_ref(invocation);
-       data->handle = (net_nfc_target_handle_s *) arg_handle;
+       data->handle = (net_nfc_target_handle_s *) (intptr_t)arg_handle;
 
        if (net_nfc_server_controller_async_queue_push_force(se_get_atr_thread_func, data) == FALSE) {
                /* return error if queue was blocked */
@@ -1059,7 +1059,7 @@ static void se_open_secure_element_thread_func(gpointer user_data)
 #ifdef ACCESS_CONTROL
  END:
 #endif
-       net_nfc_gdbus_secure_element_complete_open_secure_element(detail->object, detail->invocation, result, (guint) handle);
+       net_nfc_gdbus_secure_element_complete_open_secure_element(detail->object, detail->invocation, result, (intptr_t) handle);
 
        g_object_unref(detail->invocation);
        g_object_unref(detail->object);
@@ -1189,7 +1189,7 @@ static gboolean se_handle_send_apdu(NetNfcGDbusSecureElement * object, GDBusMeth
 
        data->object = g_object_ref(object);
        data->invocation = g_object_ref(invocation);
-       data->handle = (net_nfc_target_handle_s *) arg_handle;
+       data->handle = (net_nfc_target_handle_s *) (intptr_t)arg_handle;
        data->data = g_variant_ref(apdudata);
 
        if (net_nfc_server_controller_async_queue_push_force(se_send_apdu_thread_func, data) == FALSE) {
@@ -2037,8 +2037,8 @@ static void se_get_registered_aids_thread_func(gpointer user_data)
 
        g_variant_builder_init(&builder, G_VARIANT_TYPE("a(sb)"));
 
-       params[0] = (gpointer) data->category;
-       params[1] = (gpointer) data->se_type;
+       params[0] = (gpointer) (intptr_t)data->category;
+       params[1] = (gpointer) (intptr_t)data->se_type;
        params[2] = &builder;
 
        net_nfc_server_route_table_iterate_aids_by_id(id, __get_aids_iter_cb, params);
@@ -2670,7 +2670,7 @@ static void se_get_registered_handlers_thread_func(gpointer user_data)
                goto END;
        }
 #endif
-       params[0] = (gpointer) data->category;
+       params[0] = (gpointer) (intptr_t)data->category;
        params[1] = &builder;
 
        net_nfc_server_route_table_iterate_handler(__get_handlers_iter_cb, params);
@@ -2883,7 +2883,7 @@ static void se_get_conflict_handlers_thread_func(gpointer user_data)
        gpointer params[5];
 
        params[0] = (gpointer) data->package;
-       params[1] = (gpointer) data->category;
+       params[1] = (gpointer) (intptr_t)data->category;
        params[2] = (gpointer) data->aid;
        params[3] = &result;
        params[4] = &builder;
@@ -3351,7 +3351,7 @@ static void ____delayed_change_screen_state_thread_func(gpointer user_data)
        DEBUG_SERVER_MSG(">>>");
 
        if (net_nfc_controller_set_screen_state((net_nfc_screen_state_type_e) user_data, &result) == true)
-               DEBUG_SERVER_MSG("Set Screen State [%d]", (int)user_data);
+               DEBUG_SERVER_MSG("Set Screen State [%p]", user_data);
 }
 
 static gboolean __delayed_change_screen_state(gpointer user_data)
old mode 100755 (executable)
new mode 100644 (file)
index 8edc9e5..fd6f1e2
@@ -83,7 +83,7 @@ static net_nfc_error_e _snep_server_cb(net_nfc_snep_handle_h handle, net_nfc_err
                {
                        uint32_t max_len = 0;
 
-                       net_nfc_server_snep_parse_get_request(data, &max_len, temp);
+                       net_nfc_server_snep_parse_get_request(data, (size_t *)&max_len, temp);
                }
                break;
 
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)