Remove the use of the 'hh' format specifier.

It's not supported in mingw.

See https://github.com/TokTok/c-toxcore/issues/786.

3 files changed, 11 insertions, 9 deletions

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;