cleanup: Fix some clang-19 format warnings.

Author: iphydf

auto_tests/TCP_test.c

@@ -544,8 +544,8 @@ static void test_client(void)
 
     // The connection status should be unconfirmed here because we have finished
     // sending our data and are awaiting a response.
-    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_UNCONFIRMED, "Wrong connection status. Expected: %d, is: %d.",
-                  TCP_CLIENT_UNCONFIRMED, tcp_con_status(conn));
+    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_UNCONFIRMED, "Wrong connection status. Expected: %u, is: %u.",
+                  (unsigned int)TCP_CLIENT_UNCONFIRMED, tcp_con_status(conn));
 
     do_tcp_server_delay(tcp_s, mono_time, 50); // Now let the server handle requests...
 
@@ -556,16 +556,16 @@ static void test_client(void)
         do_tcp_connection(logger, mono_time, conn, nullptr); // Run the connection loop.
 
         // The status of the connection should continue to be TCP_CLIENT_CONFIRMED after multiple subsequent do_tcp_connection() calls.
-        ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_CONFIRMED, "Wrong connection status. Expected: %d, is: %d",
-                      TCP_CLIENT_CONFIRMED, tcp_con_status(conn));
+        ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_CONFIRMED, "Wrong connection status. Expected: %u, is: %u",
+                      (unsigned int)TCP_CLIENT_CONFIRMED, tcp_con_status(conn));
 
         c_sleep(i == loop_size - 1 ? 0 : 500); // Sleep for 500ms on all except third loop.
     }
 
     do_tcp_server_delay(tcp_s, mono_time, 50);
 
     // And still after the server runs again.
-    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_CONFIRMED, "Wrong status. Expected: %d, is: %d", TCP_CLIENT_CONFIRMED,
+    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_CONFIRMED, "Wrong status. Expected: %u, is: %u", (unsigned int)TCP_CLIENT_CONFIRMED,
                   tcp_con_status(conn));
 
     uint8_t f2_public_key[CRYPTO_PUBLIC_KEY_SIZE];
@@ -680,20 +680,20 @@ static void test_client_invalid(void)
     c_sleep(50);
 
     // After 50ms of no response...
-    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_CONNECTING, "Wrong status. Expected: %d, is: %d.",
-                  TCP_CLIENT_CONNECTING, tcp_con_status(conn));
+    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_CONNECTING, "Wrong status. Expected: %u, is: %u.",
+                  (unsigned int)TCP_CLIENT_CONNECTING, tcp_con_status(conn));
     // After 5s...
     c_sleep(5000);
     mono_time_update(mono_time);
     do_tcp_connection(logger, mono_time, conn, nullptr);
-    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_CONNECTING, "Wrong status. Expected: %d, is: %d.",
-                  TCP_CLIENT_CONNECTING, tcp_con_status(conn));
+    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_CONNECTING, "Wrong status. Expected: %u, is: %u.",
+                  (unsigned int)TCP_CLIENT_CONNECTING, tcp_con_status(conn));
     // 11s... (Should wait for 10 before giving up.)
     c_sleep(6000);
     mono_time_update(mono_time);
     do_tcp_connection(logger, mono_time, conn, nullptr);
-    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_DISCONNECTED, "Wrong status. Expected: %d, is: %d.",
-                  TCP_CLIENT_DISCONNECTED, tcp_con_status(conn));
+    ck_assert_msg(tcp_con_status(conn) == TCP_CLIENT_DISCONNECTED, "Wrong status. Expected: %u, is: %u.",
+                  (unsigned int)TCP_CLIENT_DISCONNECTED, tcp_con_status(conn));
 
     kill_tcp_connection(conn);
 

auto_tests/auto_test_support.c

@@ -79,14 +79,14 @@ void bootstrap_tox_live_network(Tox *tox, bool enable_tcp)
         tox_bootstrap(tox, ip, port, key, &err);
 
         if (err != TOX_ERR_BOOTSTRAP_OK) {
-            fprintf(stderr, "Failed to bootstrap node %zu (%s): error %d\n", j, ip, err);
+            fprintf(stderr, "Failed to bootstrap node %zu (%s): error %u\n", j, ip, err);
         }
 
         if (enable_tcp) {
             tox_add_tcp_relay(tox, ip, port, key, &err);
 
             if (err != TOX_ERR_BOOTSTRAP_OK) {
-                fprintf(stderr, "Failed to add TCP relay %zu (%s): error %d\n", j, ip, err);
+                fprintf(stderr, "Failed to add TCP relay %zu (%s): error %u\n", j, ip, err);
             }
         }
     }
@@ -247,7 +247,7 @@ static void initialise_autotox(struct Tox_Options *options, AutoTox *autotox, ui
             tox_options_set_tcp_port(options, 0);
             autotest_opts->tcp_port = 0;
             autotox->tox = tox_new_log(options, &err, &autotox->index);
-            ck_assert_msg(err == TOX_ERR_NEW_OK, "unexpected tox_new error: %d", err);
+            ck_assert_msg(err == TOX_ERR_NEW_OK, "unexpected tox_new error: %u", err);
         } else {
             // Try a few ports for the TCP relay.
             for (uint16_t tcp_port = autotest_opts->tcp_port; tcp_port < autotest_opts->tcp_port + 200; ++tcp_port) {
@@ -259,7 +259,7 @@ static void initialise_autotox(struct Tox_Options *options, AutoTox *autotox, ui
                     break;
                 }
 
-                ck_assert_msg(err == TOX_ERR_NEW_PORT_ALLOC, "unexpected tox_new error (expected PORT_ALLOC): %d", err);
+                ck_assert_msg(err == TOX_ERR_NEW_PORT_ALLOC, "unexpected tox_new error (expected PORT_ALLOC): %u", err);
             }
         }
 
@@ -273,7 +273,7 @@ static void initialise_autotox(struct Tox_Options *options, AutoTox *autotox, ui
         autotox->tox = tox_new_log(options, &err, &autotox->index);
     }
 
-    ck_assert_msg(autotox->tox != nullptr, "failed to create tox instance #%u (error = %d)", index, err);
+    ck_assert_msg(autotox->tox != nullptr, "failed to create tox instance #%u (error = %u)", index, err);
 
     set_mono_time_callback(autotox);
 
@@ -348,7 +348,7 @@ static void bootstrap_autotoxes(const Tox_Options *options, uint32_t tox_count,
     for (uint32_t i = 1; i < tox_count; ++i) {
         Tox_Err_Bootstrap err;
         tox_bootstrap(autotoxes[i].tox, "localhost", dht_port, dht_key, &err);
-        ck_assert_msg(err == TOX_ERR_BOOTSTRAP_OK, "bootstrap error for port %d: %d", dht_port, err);
+        ck_assert_msg(err == TOX_ERR_BOOTSTRAP_OK, "bootstrap error for port %d: %u", dht_port, err);
     }
 
     if (!udp_enabled) {

auto_tests/bootstrap_test.c

@@ -25,8 +25,8 @@ int main(void)
 
     const Tox_Connection status = tox_self_get_connection_status(tox_udp);
     ck_assert_msg(status == TOX_CONNECTION_UDP,
-                  "expected connection status to be UDP, but got %d", status);
-    printf("Connection (UDP): %d\n", tox_self_get_connection_status(tox_udp));
+                  "expected connection status to be UDP, but got %u", status);
+    printf("Connection (UDP): %u\n", tox_self_get_connection_status(tox_udp));
 
     tox_kill(tox_udp);
 

auto_tests/conference_av_test.c

@@ -83,7 +83,7 @@ static void handle_conference_invite(
     const uint8_t *cookie = tox_event_conference_invite_get_cookie(event);
     const size_t length = tox_event_conference_invite_get_cookie_length(event);
 
-    ck_assert_msg(type == TOX_CONFERENCE_TYPE_AV, "tox #%u: wrong conference type: %d", autotox->index, type);
+    ck_assert_msg(type == TOX_CONFERENCE_TYPE_AV, "tox #%u: wrong conference type: %u", autotox->index, type);
 
     ck_assert_msg(toxav_join_av_groupchat(autotox->tox, friend_number, cookie, length, audio_callback, user_data) == 0,
                   "tox #%u: failed to join group", autotox->index);
@@ -101,7 +101,7 @@ static void handle_conference_connected(
 
     Tox_Err_Conference_Invite err;
     tox_conference_invite(autotox->tox, 1, 0, &err);
-    ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, "tox #%u failed to invite next friend: err = %d", autotox->index,
+    ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, "tox #%u failed to invite next friend: err = %u", autotox->index,
                   err);
     printf("tox #%u: invited next friend\n", autotox->index);
     state->invited_next = true;

auto_tests/conference_double_invite_test.c

@@ -22,7 +22,7 @@ static void handle_conference_invite(
     const uint8_t *cookie = tox_event_conference_invite_get_cookie(event);
     const size_t length = tox_event_conference_invite_get_cookie_length(event);
 
-    fprintf(stderr, "handle_conference_invite(#%u, %u, %d, uint8_t[%u], _)\n",
+    fprintf(stderr, "handle_conference_invite(#%u, %u, %u, uint8_t[%u], _)\n",
             autotox->index, friend_number, type, (unsigned)length);
     fprintf(stderr, "tox%u joining conference\n", autotox->index);
 
@@ -32,7 +32,7 @@ static void handle_conference_invite(
         Tox_Err_Conference_Join err;
         state->conference = tox_conference_join(autotox->tox, friend_number, cookie, length, &err);
         ck_assert_msg(err == TOX_ERR_CONFERENCE_JOIN_OK,
-                      "attempting to join the conference returned with an error: %d", err);
+                      "attempting to join the conference returned with an error: %u", err);
         fprintf(stderr, "tox%u joined conference %u\n", autotox->index, state->conference);
         state->joined = true;
     }
@@ -54,7 +54,7 @@ static void conference_double_invite_test(AutoTox *autotoxes)
         state[0]->conference = tox_conference_new(autotoxes[0].tox, &err);
         state[0]->joined = true;
         ck_assert_msg(err == TOX_ERR_CONFERENCE_NEW_OK,
-                      "attempting to create a new conference returned with an error: %d", err);
+                      "attempting to create a new conference returned with an error: %u", err);
         fprintf(stderr, "Created conference: index=%u\n", state[0]->conference);
     }
 
@@ -63,7 +63,7 @@ static void conference_double_invite_test(AutoTox *autotoxes)
         Tox_Err_Conference_Invite err;
         tox_conference_invite(autotoxes[0].tox, 0, state[0]->conference, &err);
         ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK,
-                      "attempting to invite a friend returned with an error: %d", err);
+                      "attempting to invite a friend returned with an error: %u", err);
         fprintf(stderr, "tox0 invited tox1\n");
     }
 

auto_tests/conference_invite_merge_test.c

@@ -25,7 +25,7 @@ static void handle_conference_invite(
         Tox_Err_Conference_Join err;
         state->conference = tox_conference_join(autotox->tox, friend_number, cookie, length, &err);
         ck_assert_msg(err == TOX_ERR_CONFERENCE_JOIN_OK,
-                      "attempting to join the conference returned with an error: %d", err);
+                      "attempting to join the conference returned with an error: %u", err);
         fprintf(stderr, "#%u accepted invite to conference %u\n", autotox->index, state->conference);
     }
 }
@@ -54,7 +54,7 @@ static void do_invite(AutoTox *autotoxes, AutoTox *inviter, AutoTox *invitee, ui
     Tox_Err_Conference_Invite err;
     tox_conference_invite(inviter->tox, friendnum, ((State *)inviter->state)->conference, &err);
     ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK,
-                  "#%u attempting to invite #%u (friendnumber %u) returned with an error: %d", inviter->index, invitee->index,
+                  "#%u attempting to invite #%u (friendnumber %u) returned with an error: %u", inviter->index, invitee->index,
                   friendnum, err);
 
     do {
@@ -110,7 +110,7 @@ static void conference_invite_merge_test(AutoTox *autotoxes)
         state2->conference = tox_conference_new(autotoxes[2].tox, &err);
         state2->connected = true;
         ck_assert_msg(err == TOX_ERR_CONFERENCE_NEW_OK,
-                      "attempting to create a new conference returned with an error: %d", err);
+                      "attempting to create a new conference returned with an error: %u", err);
         fprintf(stderr, "Created conference: index=%u\n", state2->conference);
     }
 

auto_tests/conference_peer_nick_test.c

@@ -23,14 +23,14 @@ static void handle_conference_invite(
     const uint8_t *cookie = tox_event_conference_invite_get_cookie(event);
     const size_t length = tox_event_conference_invite_get_cookie_length(event);
 
-    fprintf(stderr, "handle_conference_invite(#%u, %u, %d, uint8_t[%u], _)\n",
+    fprintf(stderr, "handle_conference_invite(#%u, %u, %u, uint8_t[%u], _)\n",
             autotox->index, friend_number, type, (unsigned)length);
     fprintf(stderr, "tox%u joining conference\n", autotox->index);
 
     Tox_Err_Conference_Join err;
     state->conference = tox_conference_join(autotox->tox, friend_number, cookie, length, &err);
     ck_assert_msg(err == TOX_ERR_CONFERENCE_JOIN_OK,
-                  "attempting to join the conference returned with an error: %d", err);
+                  "attempting to join the conference returned with an error: %u", err);
     fprintf(stderr, "tox%u joined conference %u\n", autotox->index, state->conference);
     state->joined = true;
 }
@@ -47,7 +47,7 @@ static void handle_peer_list_changed(const Tox_Event_Conference_Peer_List_Change
     Tox_Err_Conference_Peer_Query err;
     uint32_t const count = tox_conference_peer_count(autotox->tox, conference_number, &err);
     ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK,
-                  "failed to get conference peer count: err = %d", err);
+                  "failed to get conference peer count: err = %u", err);
     printf("tox%u has %u peers\n", autotox->index, count);
     state->friend_in_group = count == 2;
 }
@@ -60,18 +60,18 @@ static void rebuild_peer_list(Tox *tox)
         Tox_Err_Conference_Peer_Query err;
         uint32_t const count = tox_conference_peer_count(tox, conference_number, &err);
         ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK,
-                      "failed to get conference peer count for conference %u: err = %d", conference_number, err);
+                      "failed to get conference peer count for conference %u: err = %u", conference_number, err);
 
         for (uint32_t peer_number = 0; peer_number < count; peer_number++) {
             size_t size = tox_conference_peer_get_name_size(tox, conference_number, peer_number, &err);
             ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK,
-                          "failed to get conference peer %u's name size (conference = %u): err = %d", peer_number, conference_number, err);
+                          "failed to get conference peer %u's name size (conference = %u): err = %u", peer_number, conference_number, err);
 
             uint8_t *const name = (uint8_t *)malloc(size);
             ck_assert(name != nullptr);
             tox_conference_peer_get_name(tox, conference_number, peer_number, name, &err);
             ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK,
-                          "failed to get conference peer %u's name (conference = %u): err = %d", peer_number, conference_number, err);
+                          "failed to get conference peer %u's name (conference = %u): err = %u", peer_number, conference_number, err);
             free(name);
         }
     }
@@ -99,7 +99,7 @@ static void conference_peer_nick_test(AutoTox *autotoxes)
         state[0]->conference = tox_conference_new(autotoxes[0].tox, &err);
         state[0]->joined = true;
         ck_assert_msg(err == TOX_ERR_CONFERENCE_NEW_OK,
-                      "attempting to create a new conference returned with an error: %d", err);
+                      "attempting to create a new conference returned with an error: %u", err);
         fprintf(stderr, "Created conference: index=%u\n", state[0]->conference);
     }
 
@@ -108,7 +108,7 @@ static void conference_peer_nick_test(AutoTox *autotoxes)
         Tox_Err_Conference_Invite err;
         tox_conference_invite(autotoxes[0].tox, 0, state[0]->conference, &err);
         ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK,
-                      "attempting to invite a friend returned with an error: %d", err);
+                      "attempting to invite a friend returned with an error: %u", err);
         fprintf(stderr, "tox0 invited tox1\n");
     }