Fix 64bit build error

Change-Id: Icc9ddd60b872c37cfaad84fbeee5efd2255408d5

diff --git a/src/thread-br.c b/src/thread-br.c
index fa837c6..7fa9d07 100644 (file)
--- a/src/thread-br.c
+++ b/src/thread-br.c
@@ -305,14 +305,14 @@ int thread_br_add_external_route(thread_instance_h instance,
                ipv6_prefix_len);
 
        if (is_stable)
-               strncat(msg, " s", 2);
+               strncat(msg, " s", 3);
 
        if (preference == 0)
-               strncat(msg, " low", 4);
+               strncat(msg, " low", 5);
        else if (preference == 1)
-               strncat(msg, " med", 4);
+               strncat(msg, " med", 5);
        else if (preference == 2)
-               strncat(msg, " high", 5);
+               strncat(msg, " high", 6);
 
        THREAD_DBG("DEBUG: BORDER ROUTER MESSAGE -> [%s]", msg);
        int ret = _thread_socket_client_execute(_thread_get_socket_fd(),
@@ -418,24 +418,24 @@ int thread_br_add_onmesh_prefix(thread_instance_h instance,
                ipv6_prefix_len);
 
        if (preference == 0)
-               strncat(msg, " low ", 5);
+               strncat(msg, " low ", 6);
        else if (preference == 1)
-               strncat(msg, " med ", 5);
+               strncat(msg, " med ", 6);
        else if (preference == 2)
-               strncat(msg, " high ", 6);
+               strncat(msg, " high ", 7);
 
        if (preferred)
-               strncat(msg, "p", 1);
+               strncat(msg, "p", 2);
        if (slaac)
-               strncat(msg, "a", 1);
+               strncat(msg, "a", 2);
        if (configure)
-               strncat(msg, "c", 1);
+               strncat(msg, "c", 2);
        if (default_route)
-               strncat(msg, "r", 1);
+               strncat(msg, "r", 2);
        if (on_mesh)
-               strncat(msg, "o", 1);
+               strncat(msg, "o", 2);
        if (stable)
-               strncat(msg, "s", 1);
+               strncat(msg, "s", 2);
 
        THREAD_DBG("DEBUG: BORDER ROUTER MESSAGE -> [%s]", msg);
        int ret = _thread_socket_client_execute(_thread_get_socket_fd(),

diff --git a/src/thread-core.c b/src/thread-core.c
index 3eb8896..66a1620 100644 (file)
--- a/src/thread-core.c
+++ b/src/thread-core.c
@@ -546,7 +546,7 @@ int thread_get_extended_address(thread_instance_h instance, uint64_t *extended_a
        retv_if(ret != THREAD_ERROR_NONE, ret);
 
        g_variant_get(out, "t", extended_address);
-       THREAD_DBG("Thread extended address: %llu", *extended_address);
+       THREAD_DBG("Thread extended address: %zu", (size_t)*extended_address);
        g_variant_unref(out);
 
        FUNC_EXIT;

diff --git a/src/thread-network.c b/src/thread-network.c
index 2f3caa9..bdfe802 100644 (file)
--- a/src/thread-network.c
+++ b/src/thread-network.c
@@ -70,7 +70,7 @@ int thread_network_create_operational_network(thread_instance_h instance,
        THREAD_DBG("Network key: %s", key);
        THREAD_DBG("Network pskc: %s", pskc);
        THREAD_DBG("Network channel: 0x%8.8x", channel);
-       THREAD_DBG("Network extended_panid: %llu", extended_panid);
+       THREAD_DBG("Network extended_panid: %zu", (size_t)extended_panid);
        THREAD_DBG("Network panid: %u", panid);
 
        /* Free existing current network */
@@ -206,7 +206,7 @@ int thread_network_get_active_dataset_tlvs(thread_instance_h instance,
                THREAD_DBG("Failed to execute command %s", cmd_buffer);
                return ret;
        }
-       THREAD_DBG("Executed command '%s' with size %d", cmd_buffer, strlen(cmd_buffer));
+       THREAD_DBG("Executed command '%s' with size %zu", cmd_buffer, strlen(cmd_buffer));
 
        /* Check response */
        ret = _thread_socket_client_read(session_fd, buffer);
@@ -276,7 +276,7 @@ int thread_network_attach(thread_instance_h instance)
        THREAD_DBG("Network pskc: %s", network->pskc);
        THREAD_DBG("Network channel: 0x%8.8x", network->channel);
 
-       THREAD_DBG("Network extended_panid: %llu", network->extended_panid);
+       THREAD_DBG("Network extended_panid: %zu", (size_t)network->extended_panid);
        if (network->extended_panid == UINT64_MAX)
                THREAD_DBG("extended_panid is UINT64_MAX, "\
                        "Random extended_panid will be used");
@@ -297,7 +297,7 @@ int thread_network_attach(thread_instance_h instance)
        /* Network key builder */
        GVariantBuilder *key_builder;
        key_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
-       THREAD_DBG("key str length: %d", strlen(network->key));
+       THREAD_DBG("key str length: %zu", strlen(network->key));
        for (int i = 0; i < strlen(network->key); i++) {
                g_variant_builder_add(key_builder, "y",
                                (unsigned char)network->key[i]);
@@ -306,7 +306,7 @@ int thread_network_attach(thread_instance_h instance)
        /* pskc builder */
        GVariantBuilder *pskc_builder;
        pskc_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
-       THREAD_DBG("pskc str length: %d", strlen(network->pskc));
+       THREAD_DBG("pskc str length: %zu", strlen(network->pskc));
        for (int i = 0; i < strlen(network->pskc); i++) {
                g_variant_builder_add(pskc_builder, "y",
                                (unsigned char)network->pskc[i]);
@@ -387,7 +387,7 @@ int thread_get_ipaddr(thread_instance_h instance, thread_ipaddr_foreach_cb callb
                THREAD_DBG("Failed to execute command %s", cmd_buffer);
                return ret;
        }
-       THREAD_DBG("Executed command '%s' with size %d", cmd_buffer, buf_size);
+       THREAD_DBG("Executed command '%s' with size %zu", cmd_buffer, buf_size);
 
        /* Check response */
        ret = _thread_socket_client_read(session_fd, buffer);
@@ -406,7 +406,7 @@ int thread_get_ipaddr(thread_instance_h instance, thread_ipaddr_foreach_cb callb
                } else {
                        ipaddr[pos] = '\0';
                        if (pos > 0) {
-                               THREAD_DBG("IP address: %s, length: %d", ipaddr,
+                               THREAD_DBG("IP address: %s, length: %zu", ipaddr,
                                                                strlen(ipaddr));
                                callback(++count, ipaddr, ipaddr_type, user_data);
                        }

diff --git a/src/thread-socket-handler.c b/src/thread-socket-handler.c
index 553d9db..5de3fe0 100644 (file)
--- a/src/thread-socket-handler.c
+++ b/src/thread-socket-handler.c
@@ -254,7 +254,7 @@ int _thread_socket_client_write(int session_fd,
        if (!request_buffer || buf_size <= 0)
                return THREAD_ERROR_INVALID_PARAMETER;
 
-       THREAD_DBG("Socket write command '%s' with size %d",
+       THREAD_DBG("Socket write command '%s' with size %zu",
                                        request_buffer, buf_size);
 
        rval = write(session_fd, request_buffer, buf_size);

diff --git a/src/thread-srp.c b/src/thread-srp.c
index edb5066..5417c4e 100644 (file)
--- a/src/thread-srp.c
+++ b/src/thread-srp.c
@@ -161,8 +161,8 @@ int thread_srp_client_register_service(thread_instance_h instance,
        const char *msg = THREAD_SRP_CLIENT_REGISTER_SERVICE_CMD;
 
        char buffer[THREAD_MAX_BUFFER_SIZE] = {0};
-       snprintf(buffer, sizeof(buffer), "%s %s %s %llu", msg,
-                               service_name, service_type, port);
+       snprintf(buffer, sizeof(buffer), "%s %s %s %zu", msg,
+                               service_name, service_type, (size_t)port);
        ret = _thread_socket_client_execute(_thread_get_socket_fd(),
                                                buffer, strlen(buffer));
        if (ret != THREAD_ERROR_NONE && ret != THREAD_ERROR_ALREADY_DONE) {

diff --git a/src/thread-util.c b/src/thread-util.c
old mode 100755 (executable)
new mode 100644 (file)
index 1225fa9..fc9eebd
--- a/src/thread-util.c
+++ b/src/thread-util.c
@@ -188,9 +188,9 @@ void __thread_dbus_handle_scan_cb(gboolean res,
                &version, &is_native, &is_native)) {
 
                THREAD_DBG("Got the thread beacon...");
-               THREAD_DBG("ext_address: %llu", ext_address);
+               THREAD_DBG("ext_address: %zu", (size_t)ext_address);
                THREAD_DBG("network_name: %s", network_name);
-               THREAD_DBG("ext panid: %llu", ext_panid);
+               THREAD_DBG("ext panid: %zu", (size_t)ext_panid);
 
                int i = 0;
                while (steering_data[i] != '\0') {

diff --git a/tests/thread-core.c b/tests/thread-core.c
index 57c9749..7d2d987 100755 (executable)
--- a/tests/thread-core.c
+++ b/tests/thread-core.c
@@ -57,9 +57,9 @@ static void __thread_scan_callback(int result, thread_network_scanning_state_e s
        else {
                msg("thread_network_scanning_state: [%d]", state);
                msg("network_name: [%s]", network_name);
-               msg("ext_address: [%llu]", ext_address);
-               msg("ext_panidi: [%llu]", ext_panidi);
-               msg("steering_data: [%d]", (int)steering_data);
+               msg("ext_address: [%zu]", (size_t)ext_address);
+               msg("ext_panidi: [%zu]", (size_t)ext_panidi);
+               msg("steering_data: [%s]", steering_data);
                msg("length: [%d]", length);
                msg("panid: [%hu]", panid);
                msg("joiner_udp_port: [%hu]", joiner_udp_port);
@@ -318,8 +318,8 @@ static int run_thread_get_extended_address(MManager *mm, struct menu_data *menu)
        int ret = thread_get_extended_address(g_instance, &g_extended_address);
        if (ret == THREAD_ERROR_NONE) {
                msg("thread_get_extended_address success");
-               msg("- thread_get_exenteded_address() ret: Device extended address->[%llu]",
-                       g_extended_address);
+               msg("- thread_get_exenteded_address() ret: Device extended address->[%zu]",
+                       (size_t)g_extended_address);
        } else
                msg("thread_get_extended_address failed");
 OUT:

diff --git a/tests/thread-network.c b/tests/thread-network.c
index d2002e6..2ed4fbd 100644 (file)
--- a/tests/thread-network.c
+++ b/tests/thread-network.c
@@ -76,7 +76,7 @@ static int run_thread_network_create_operational_network(MManager *mm, struct me
                goto OUT;
 
        sscanf(g_str_channel, "%x", &g_channel);
-       sscanf(g_str_extended_panid, "%llu", &g_extended_panid);
+       sscanf(g_str_extended_panid, "%zu", (size_t *)&g_extended_panid);
        sscanf(g_str_panid, "%hu", &g_panid);
 
        int ret = thread_network_create_operational_network(g_instance, g_name, g_key,

diff --git a/tests/thread-scenarios.c b/tests/thread-scenarios.c
index d7fc126..369282c 100644 (file)
--- a/tests/thread-scenarios.c
+++ b/tests/thread-scenarios.c
@@ -151,7 +151,7 @@ static int run_thread_start_leader_as_commissioner(MManager *mm, struct menu_dat
        goto OUT;
 
        sscanf(g_str_channel, "%x", &g_channel);
-       sscanf(g_str_extended_panid, "%llu", &g_extended_panid);
+       sscanf(g_str_extended_panid, "%zu", (size_t *)&g_extended_panid);
        sscanf(g_str_panid, "%hu", &g_panid);
 
        int ret = THREAD_ERROR_NONE;

diff --git a/tests/thread-srp.c b/tests/thread-srp.c
index 70fb291..8b50389 100644 (file)
--- a/tests/thread-srp.c
+++ b/tests/thread-srp.c
@@ -193,7 +193,7 @@ static int __run_thread_srp_server_get_registered_service(MManager *mm, struct m
 
        if (ret == THREAD_ERROR_NONE) {
                msg("thread_srp_get_registered_service success");
-               msg("service: [%s], [%s], [%llu], [%s]", service_name, address, port, is_deleted ? "TRUE" : "FALSE");
+               msg("service: [%s], [%s], [%zu], [%s]", service_name, address, (size_t)port, is_deleted ? "TRUE" : "FALSE");
        } else
                msg("thread_srp_get_registered_service failed");
 OUT: