6 files changed, 30 insertions, 31 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);