From c75215c23ad9e3a3142ce65a06a6231425f0e30e Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 3 Jul 2018 10:26:06 -0400
Subject: [PATCH] Clean up various things that broke with our stdint.h changes

Casting before printf was necessary; now it's not so smart.

We don't have SIZEOF_UINT8_T any more.
---
 src/or/torcert.c       |  3 +--
 src/test/test.h        | 22 +++++++---------------
 src/test/test_crypto.c |  7 +++----
 src/test/test_geoip.c  |  1 -
 src/test/test_util.c   |  2 +-
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/or/torcert.c b/src/or/torcert.c
index 785132c174..f443738054 100644
--- a/src/or/torcert.c
+++ b/src/or/torcert.c
@@ -168,7 +168,7 @@ tor_cert_parse(const uint8_t *encoded, const size_t len)
 
   memcpy(cert->signed_key.pubkey, parsed->certified_key, 32);
   int64_t valid_until_64 = ((int64_t)parsed->exp_field) * 3600;
-#if SIZEOF_TIME_T < SIZEOF_INT64_T
+#if SIZEOF_TIME_T < 8
   if (valid_until_64 > TIME_MAX)
     valid_until_64 = TIME_MAX - 1;
 #endif
@@ -723,4 +723,3 @@ tor_cert_encode_ed22519(const tor_cert_t *cert, char **cert_str_out)
   tor_free(ed_cert_b64);
   return ret;
 }
-
diff --git a/src/test/test.h b/src/test/test.h
index c231bc5f87..602acca1cd 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -50,28 +50,20 @@
   tt_double_op((a), OP_LE, (b)); \
   STMT_END
 
-#ifdef _MSC_VER
-#define U64_PRINTF_TYPE uint64_t
-#define I64_PRINTF_TYPE int64_t
-#else
-#define U64_PRINTF_TYPE unsigned long long
-#define I64_PRINTF_TYPE long long
-#endif /* defined(_MSC_VER) */
-
 #define tt_size_op(a,op,b)                                              \
   tt_assert_test_fmt_type(a,b,#a" "#op" "#b,size_t,(val1_ op val2_),    \
-    U64_PRINTF_TYPE, U64_FORMAT,                                        \
-    {print_ = (U64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION)
+    size_t, "%"TOR_PRIuSZ,                                              \
+    {print_ = (size_t) value_;}, {}, TT_EXIT_TEST_FUNCTION)
 
 #define tt_u64_op(a,op,b)                                              \
   tt_assert_test_fmt_type(a,b,#a" "#op" "#b,uint64_t,(val1_ op val2_), \
-    U64_PRINTF_TYPE, U64_FORMAT,                                       \
-    {print_ = (U64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION)
+    uint64_t, "%"PRIu64,                                               \
+    {print_ = (uint64_t) value_;}, {}, TT_EXIT_TEST_FUNCTION)
 
 #define tt_i64_op(a,op,b)                                              \
-  tt_assert_test_fmt_type(a,b,#a" "#op" "#b,int64_t,(val1_ op val2_), \
-    I64_PRINTF_TYPE, I64_FORMAT,                                       \
-    {print_ = (I64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION)
+  tt_assert_test_fmt_type(a,b,#a" "#op" "#b,int64_t,(val1_ op val2_),  \
+    int64_t, "%"PRId64,                                                \
+    {print_ = (int64_t) value_;}, {}, TT_EXIT_TEST_FUNCTION)
 
 /**
  * Declare that the test is done, even though no tt___op() calls were made.
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index e8a2efe597..ecbc6745d7 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -2862,12 +2862,12 @@ crypto_rand_check_failure_mode_identical(void)
 {
   /* just in case the buffer size isn't a multiple of sizeof(int64_t) */
 #define FAILURE_MODE_BUFFER_SIZE_I64 \
-  (FAILURE_MODE_BUFFER_SIZE/SIZEOF_INT64_T)
+  (FAILURE_MODE_BUFFER_SIZE/8)
 #define FAILURE_MODE_BUFFER_SIZE_I64_BYTES \
-  (FAILURE_MODE_BUFFER_SIZE_I64*SIZEOF_INT64_T)
+  (FAILURE_MODE_BUFFER_SIZE_I64*8)
 
 #if FAILURE_MODE_BUFFER_SIZE_I64 < 2
-#error FAILURE_MODE_BUFFER_SIZE needs to be at least 2*SIZEOF_INT64_T
+#error FAILURE_MODE_BUFFER_SIZE needs to be at least 2*8
 #endif
 
   int64_t buf[FAILURE_MODE_BUFFER_SIZE_I64];
@@ -3063,4 +3063,3 @@ struct testcase_t crypto_tests[] = {
   { "failure_modes", test_crypto_failure_modes, TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_geoip.c b/src/test/test_geoip.c
index d50dd134e0..9aa46786ed 100644
--- a/src/test/test_geoip.c
+++ b/src/test/test_geoip.c
@@ -575,4 +575,3 @@ struct testcase_t geoip_tests[] = {
 
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 7f37a2ab9c..53d329210d 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5564,7 +5564,7 @@ test_util_max_mem(void *arg)
     tt_uint_op(memory1, OP_GT, (1<<20));
   } else {
     /* You do not have a petabyte. */
-#if SIZEOF_SIZE_T == SIZEOF_UINT64_T
+#if SIZEOF_SIZE_T >= 8
     tt_u64_op(memory1, OP_LT, (U64_LITERAL(1)<<50));
 #endif
   }