18 files changed, 60 insertions, 53 deletions

diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index fe23a598..2814263f 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -413,7 +413,7 @@ static void print_pk(uint8_t *public_key)
     uint32_t j;
 
     for (j = 0; j < CRYPTO_PUBLIC_KEY_SIZE; j++) {
-        printf("%02hhX", public_key[j]);
+        printf("%02X", public_key[j]);
     }
 
     printf("\n");
diff --git a/auto_tests/file_saving_test.c b/auto_tests/file_saving_test.c
index 8aa14dc3..23a4c701 100644
--- a/auto_tests/file_saving_test.c
+++ b/auto_tests/file_saving_test.c
@@ -61,7 +61,7 @@ static void save_data_encrypted(void)
     }
 
     size_t written_value = fwrite(cipher, sizeof(*cipher), size, f);
-    printf("written written_value = %zu of %zu\n", written_value, size);
+    printf("written written_value = %u of %u\n", (unsigned)written_value, (unsigned)size);
 
     free(cipher);
     free(clear);
@@ -79,7 +79,7 @@ static void load_data_decrypted(void)
     uint8_t *cipher = (uint8_t *)malloc(size);
     uint8_t *clear = (uint8_t *)malloc(size - TOX_PASS_ENCRYPTION_EXTRA_LENGTH);
     size_t read_value = fread(cipher, sizeof(*cipher), size, f);
-    printf("read read_vavue = %zu of %ld\n", read_value, size);
+    printf("read read_vavue = %u of %ld\n", (unsigned)read_value, size);
 
     TOX_ERR_DECRYPTION derr;
 
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index 12b00fd7..bf3ea179 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -240,32 +240,31 @@ START_TEST(test_dht_state_saveloadsave)
      * b) a save()d state can be load()ed back successfully
      * c) a second save() is of equal size
      * d) the second save() is of equal content */
-    size_t i, extra = 64;
-    size_t size = DHT_size(m->dht);
+    const size_t extra = 64;
+    const size_t size = DHT_size(m->dht);
     VLA(uint8_t, buffer, size + 2 * extra);
     memset(buffer, 0xCD, extra);
     memset(buffer + extra + size, 0xCD, extra);
     DHT_save(m->dht, buffer + extra);
 
-    for (i = 0; i < extra; i++) {
+    for (size_t i = 0; i < extra; i++) {
         ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from DHT_save() @%u", (unsigned)i);
         ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from DHT_save() @%u", (unsigned)i);
     }
 
-    int res = DHT_load(m->dht, buffer + extra, size);
+    const int res = DHT_load(m->dht, buffer + extra, size);
 
     if (res == -1) {
         ck_assert_msg(res == 0, "Failed to load back stored buffer: res == -1");
     } else {
-        char msg[128];
-        size_t offset = res >> 4;
-        uint8_t *ptr = buffer + extra + offset;
-        sprintf(msg, "Failed to load back stored buffer: 0x%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx @%zu/%zu, code %d",
-                ptr[-2], ptr[-1], ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], offset, size, res & 0x0F);
-        ck_assert_msg(res == 0, "%s", msg);
+        const size_t offset = res >> 4;
+        const uint8_t *ptr = buffer + extra + offset;
+        ck_assert_msg(res == 0, "Failed to load back stored buffer: 0x%02x%02x%02x%02x%02x%02x%02x%02x @%u/%u, code %d",
+                      ptr[-2], ptr[-1], ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5],
+                      (unsigned)offset, (unsigned)size, res & 0x0F);
     }
 
-    size_t size2 = DHT_size(m->dht);
+    const size_t size2 = DHT_size(m->dht);
     ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u", (unsigned)size,
                   (unsigned)size2);
 
@@ -283,32 +282,31 @@ START_TEST(test_messenger_state_saveloadsave)
      * b) a save()d state can be load()ed back successfully
      * c) a second save() is of equal size
      * d) the second save() is of equal content */
-    size_t i, extra = 64;
-    size_t size = messenger_size(m);
+    const size_t extra = 64;
+    const size_t size = messenger_size(m);
     VLA(uint8_t, buffer, size + 2 * extra);
     memset(buffer, 0xCD, extra);
     memset(buffer + extra + size, 0xCD, extra);
     messenger_save(m, buffer + extra);
 
-    for (i = 0; i < extra; i++) {
+    for (size_t i = 0; i < extra; i++) {
         ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from messenger_save() @%u", (unsigned)i);
         ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from messenger_save() @%u", (unsigned)i);
     }
 
-    int res = messenger_load(m, buffer + extra, size);
+    const int res = messenger_load(m, buffer + extra, size);
 
     if (res == -1) {
         ck_assert_msg(res == 0, "Failed to load back stored buffer: res == -1");
     } else {
-        char msg[128];
-        size_t offset = res >> 4;
-        uint8_t *ptr = buffer + extra + offset;
-        sprintf(msg, "Failed to load back stored buffer: 0x%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx @%zu/%zu, code %d",
-                ptr[-2], ptr[-1], ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], offset, size, res & 0x0F);
-        ck_assert_msg(res == 0, "%s", msg);
+        const size_t offset = res >> 4;
+        const uint8_t *ptr = buffer + extra + offset;
+        ck_assert_msg(res == 0, "Failed to load back stored buffer: 0x%02x%02x%02x%02x%02x%02x%02x%02x @%u/%u, code %d",
+                      ptr[-2], ptr[-1], ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5],
+                      (unsigned)offset, (unsigned)size, res & 0x0F);
     }
 
-    size_t size2 = messenger_size(m);
+    const size_t size2 = messenger_size(m);
     ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u",
                   (unsigned)size, (unsigned)size2);
 
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index e3eb3e5e..128e122b 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -81,7 +81,7 @@ void print_client_id(uint8_t *client_id, uint32_t length)
     uint32_t j;
 
     for (j = 0; j < length; j++) {
-        printf("%02hhX", client_id[j]);
+        printf("%02X", client_id[j]);
     }
 
     printf("\n");
diff --git a/auto_tests/simple_conference_test.c b/auto_tests/simple_conference_test.c
index e6254b79..c1c6e730 100644
--- a/auto_tests/simple_conference_test.c
+++ b/auto_tests/simple_conference_test.c
@@ -44,7 +44,8 @@ static void handle_conference_invite(Tox *tox, uint32_t friend_number, TOX_CONFE
 {
     State *state = (State *)user_data;
 
-    fprintf(stderr, "\nhandle_conference_invite(#%d, %d, %d, uint8_t[%zd], _)\n", state->id, friend_number, type, length);
+    fprintf(stderr, "\nhandle_conference_invite(#%d, %d, %d, uint8_t[%u], _)\n",
+            state->id, friend_number, type, (unsigned)length);
     fprintf(stderr, "tox%d joining conference\n", state->id);
 
     {
@@ -74,8 +75,8 @@ static void handle_conference_message(Tox *tox, uint32_t conference_number, uint
 {
     State *state = (State *)user_data;
 
-    fprintf(stderr, "\nhandle_conference_message(#%d, %d, %d, %d, uint8_t[%zd], _)\n",
-            state->id, conference_number, peer_number, type, length);
+    fprintf(stderr, "\nhandle_conference_message(#%d, %d, %d, %d, uint8_t[%u], _)\n",
+            state->id, conference_number, peer_number, type, (unsigned)length);
 
     fprintf(stderr, "tox%d got message: %s\n", state->id, (const char *)message);
     state->received = true;
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index ed4aa211..e89a6823 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -215,8 +215,8 @@ static void test_av_three_calls(void)
     tox_callback_friend_request(Alice, t_accept_friend_request_cb);
     tox_self_get_address(Alice, address);
 
-    printf("bootstrapping Alice and the %zd Bobs off a third bootstrap node\n",
-           sizeof(Bobs) / sizeof(Bobs[0]));
+    printf("bootstrapping Alice and the %u Bobs off a third bootstrap node\n",
+           (unsigned)(sizeof(Bobs) / sizeof(Bobs[0])));
     uint8_t dht_key[TOX_PUBLIC_KEY_SIZE];
     tox_self_get_dht_id(bootstrap, dht_key);
     const uint16_t dht_port = tox_self_get_udp_port(bootstrap, nullptr);
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index bbb4844e..5f04e415 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -156,8 +156,8 @@ int main(int argc, char *argv[])
 
     for (i = 0; i < 32; i++) {
         const uint8_t *const self_public_key = dht_get_self_public_key(dht);
-        printf("%02hhX", self_public_key[i]);
-        fprintf(file, "%02hhX", self_public_key[i]);
+        printf("%02X", self_public_key[i]);
+        fprintf(file, "%02X", self_public_key[i]);
     }
 
     fclose(file);
diff --git a/other/bootstrap_daemon/src/config.c b/other/bootstrap_daemon/src/config.c
index 3f1592e6..a3c1f250 100644
--- a/other/bootstrap_daemon/src/config.c
+++ b/other/bootstrap_daemon/src/config.c
@@ -316,7 +316,9 @@ static uint8_t *hex_string_to_bin(const char *hex_string)
     size_t i;
 
     for (i = 0; i < len; ++i, pos += 2) {
-        sscanf(pos, "%2hhx", &ret[i]);
+        unsigned int val;
+        sscanf(pos, "%02x", &val);
+        ret[i] = val;
     }
 
     return ret;
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index bdf679c9..9f1a2db4 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -109,7 +109,7 @@ static void print_public_key(const uint8_t *public_key)
     size_t i;
 
     for (i = 0; i < CRYPTO_PUBLIC_KEY_SIZE; i++) {
-        index += sprintf(buffer + index, "%02hhX", public_key[i]);
+        index += sprintf(buffer + index, "%02X", public_key[i]);
     }
 
     log_write(LOG_LEVEL_INFO, "Public Key: %s\n", buffer);
diff --git a/other/fun/cracker.c b/other/fun/cracker.c
index 7b020bb7..9cfe96d7 100644
--- a/other/fun/cracker.c
+++ b/other/fun/cracker.c
@@ -24,7 +24,7 @@ void print_key(uint8_t *client_id)
     uint32_t j;
 
     for (j = 0; j < 32; j++) {
-        printf("%02hhX", client_id[j]);
+        printf("%02X", client_id[j]);
     }
 }
 
diff --git a/other/fun/sign.c b/other/fun/sign.c
index b24cdae7..369bc848 100644
--- a/other/fun/sign.c
+++ b/other/fun/sign.c
@@ -56,13 +56,13 @@ int main(int argc, char *argv[])
         int i;
 
         for (i = 0; i < crypto_sign_ed25519_PUBLICKEYBYTES; i++) {
-            printf("%02hhX", pk[i]);
+            printf("%02X", pk[i]);
         }
 
         printf("\nSecret key:\n");
 
         for (i = 0; i < crypto_sign_ed25519_SECRETKEYBYTES; i++) {
-            printf("%02hhX", sk[i]);
+            printf("%02X", sk[i]);
         }
 
         printf("\n");
diff --git a/other/fun/strkey.c b/other/fun/strkey.c
index 649b26dd..ef54a404 100644
--- a/other/fun/strkey.c
+++ b/other/fun/strkey.c
@@ -86,7 +86,9 @@ int main(int argc, char *argv[])
         size_t i;
 
         for (i = 0; i < len; pos += 2) {
-            sscanf(pos, "%2hhx", &desired_bin[i]);
+            unsigned int value;
+            sscanf(pos, "%02x", &value);
+            desired_bin[i] = value;
             ++i;
         }
     } else {
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index c7db4092..496c855c 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -54,22 +54,22 @@ static void print_client_id(const uint8_t *public_key)
     uint32_t j;
 
     for (j = 0; j < CRYPTO_PUBLIC_KEY_SIZE; j++) {
-        printf("%02hhX", public_key[j]);
+        printf("%02X", public_key[j]);
     }
 }
 
 static void print_hardening(const Hardening *h)
 {
     printf("Hardening:\n");
-    printf("routes_requests_ok: %hhu\n", h->routes_requests_ok);
+    printf("routes_requests_ok: %u\n", h->routes_requests_ok);
     printf("routes_requests_timestamp: %llu\n", (long long unsigned int)h->routes_requests_timestamp);
     printf("routes_requests_pingedid: ");
     print_client_id(h->routes_requests_pingedid);
-    printf("\nsend_nodes_ok: %hhu\n", h->send_nodes_ok);
+    printf("\nsend_nodes_ok: %u\n", h->send_nodes_ok);
     printf("send_nodes_timestamp: %llu\n", (long long unsigned int)h->send_nodes_timestamp);
     printf("send_nodes_pingedid: ");
     print_client_id(h->send_nodes_pingedid);
-    printf("\ntesting_requests: %hhu\n", h->testing_requests);
+    printf("\ntesting_requests: %u\n", h->testing_requests);
     printf("testing_timestamp: %llu\n", (long long unsigned int)h->testing_timestamp);
     printf("testing_pingedid: ");
     print_client_id(h->testing_pingedid);
@@ -162,7 +162,7 @@ static void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
             printf("0");
         }
 
-        printf("%hhX", data[i]);
+        printf("%X", data[i]);
     }
 
     printf("\n--------------------END-----------------------------\n\n\n");
@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
             printf("0");
         }
 
-        printf("%hhX", self_public_key[i]);
+        printf("%X", self_public_key[i]);
     }
 
     char temp_id[128];
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index daf2d125..ebc1975a 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -55,7 +55,7 @@
 static void print_message(Messenger *m, uint32_t friendnumber, unsigned int type, const uint8_t *string, size_t length,
                           void *userdata)
 {
-    printf("Message with length %zu received from %u: %s \n", length, friendnumber, string);
+    printf("Message with length %u received from %u: %s \n", (unsigned)length, friendnumber, string);
     m_send_message_generic(m, friendnumber, type, (const uint8_t *)"Test1", 6, 0);
 }
 
@@ -77,7 +77,7 @@ static void print_request(Messenger *m2, const uint8_t *public_key, const uint8_
         printf("%hhX", public_key[j]);
     }
 
-    printf("\nOf length: %zu with data: %s \n", length, data);
+    printf("\nOf length: %u with data: %s \n", (unsigned)length, data);
 
     if (length != sizeof("Install Gentoo")) {
         return;
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index 3a6a3333..9b0d9956 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -64,7 +64,9 @@ uint8_t *hex_string_to_bin(const char *hex_string)
     const char *pos = hex_string;
 
     for (i = 0; i < len; ++i, pos += 2) {
-        sscanf(pos, "%2hhx", &ret[i]);
+        unsigned int val;
+        sscanf(pos, "%02x", &val);
+        ret[i] = val;
     }
 
     return ret;
diff --git a/toxav/bwcontroller.c b/toxav/bwcontroller.c
index 6464a437..5c6782ba 100644
--- a/toxav/bwcontroller.c
+++ b/toxav/bwcontroller.c
@@ -145,7 +145,8 @@ void send_update(BWController *bwc)
             msg->recv = net_htonl(bwc->cycle.recv);
 
             if (-1 == m_send_custom_lossy_packet(bwc->m, bwc->friend_number, bwc_packet, sizeof(bwc_packet))) {
-                LOGGER_WARNING(bwc->m->log, "BWC send failed (len: %zu)! std error: %s", sizeof(bwc_packet), strerror(errno));
+                LOGGER_WARNING(bwc->m->log, "BWC send failed (len: %u)! std error: %s",
+                               (unsigned)sizeof(bwc_packet), strerror(errno));
             }
         }
 
diff --git a/toxav/rtp.c b/toxav/rtp.c
index 6093babf..c760d333 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -802,7 +802,8 @@ int rtp_send_data(RTPSession *session, const uint8_t *data, uint32_t length,
         memcpy(rdata + 1 + RTP_HEADER_SIZE, data, length);
 
         if (-1 == m_send_custom_lossy_packet(session->m, session->friend_number, rdata, SIZEOF_VLA(rdata))) {
-            LOGGER_WARNING(session->m->log, "RTP send failed (len: %zu)! std error: %s", SIZEOF_VLA(rdata), strerror(errno));
+            LOGGER_WARNING(session->m->log, "RTP send failed (len: %u)! std error: %s",
+                           (unsigned)SIZEOF_VLA(rdata), strerror(errno));
         }
     } else {
         /**
diff --git a/toxcore/network.c b/toxcore/network.c
index 3aaeb075..d88ba816 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -500,7 +500,7 @@ static int receivepacket(Logger *log, Socket sock, IP_Port *ip_port, uint8_t *da
     if (fail_or_len < 0) {
 
         if (fail_or_len < 0 && errno != EWOULDBLOCK) {
-            LOGGER_ERROR(log, "Unexpected error reading from socket: %u, %s\n", errno, strerror(errno));
+            LOGGER_ERROR(log, "Unexpected error reading from socket: %u, %s", errno, strerror(errno));
         }
 
         return -1; /* Nothing received. */
@@ -657,7 +657,7 @@ Networking_Core *new_networking_ex(Logger *log, IP ip, uint16_t port_from, uint1
 
     /* maybe check for invalid IPs like 224+.x.y.z? if there is any IP set ever */
     if (ip.family != TOX_AF_INET && ip.family != TOX_AF_INET6) {
-        LOGGER_ERROR(log, "Invalid address family: %u\n", ip.family);
+        LOGGER_ERROR(log, "Invalid address family: %u", ip.family);
         return nullptr;
     }
 
@@ -681,7 +681,7 @@ Networking_Core *new_networking_ex(Logger *log, IP ip, uint16_t port_from, uint1
 
     /* Check for socket error. */
     if (!sock_valid(temp->sock)) {
-        LOGGER_ERROR(log, "Failed to get a socket?! %u, %s\n", errno, strerror(errno));
+        LOGGER_ERROR(log, "Failed to get a socket?! %u, %s", errno, strerror(errno));
         free(temp);
 
         if (error) {