From 16a22bebb0bb4a28aec9ca76442af93462fc200e Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Fri, 17 Apr 2020 23:52:52 +0200
Subject: Remove some configure time sizeof checks

In libtar, the sizeof time_t checked when trying to store a time value.
It is pointless using the preprocessor here, as we can simply do an
if (sizeof(time_t) < ...) check and the compiler will take care
optimizing away one or the other branch.

After changing the libtar check and the corresponding unit tests, the
sizeof check can be removed from configure.ac, along with other unused
sizeof checks.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 tests/tar_gnu.c   | 12 +++++++-----
 tests/tar_pax.c   | 12 +++++++-----
 tests/tar_ustar.c | 12 +++++++-----
 tests/test.h      |  1 +
 4 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/tar_gnu.c b/tests/tar_gnu.c
index 9d0b010..9746cb0 100644
--- a/tests/tar_gnu.c
+++ b/tests/tar_gnu.c
@@ -95,11 +95,13 @@ int main(void)
 	TEST_EQUAL_UI(hdr.sb.st_uid, 01750);
 	TEST_EQUAL_UI(hdr.sb.st_gid, 01750);
 	TEST_EQUAL_UI(hdr.sb.st_size, 5);
-#if SIZEOF_TIME_T < 8
-	TEST_EQUAL_UI(hdr.sb.st_mtime, INT32_MAX);
-#else
-	TEST_EQUAL_UI(hdr.sb.st_mtime, 8589934592L);
-#endif
+
+	if (sizeof(time_t) * CHAR_BIT < 64) {
+		TEST_EQUAL_UI(hdr.sb.st_mtime, INT32_MAX);
+	} else {
+		TEST_EQUAL_UI(hdr.sb.st_mtime, 8589934592L);
+	}
+
 	TEST_EQUAL_UI(hdr.mtime, 8589934592L);
 	TEST_STR_EQUAL(hdr.name, "input.txt");
 	TEST_ASSERT(!hdr.unknown_record);
diff --git a/tests/tar_pax.c b/tests/tar_pax.c
index f2e4c5f..86dc186 100644
--- a/tests/tar_pax.c
+++ b/tests/tar_pax.c
@@ -78,11 +78,13 @@ int main(void)
 	TEST_EQUAL_UI(hdr.sb.st_uid, 01750);
 	TEST_EQUAL_UI(hdr.sb.st_gid, 01750);
 	TEST_EQUAL_UI(hdr.sb.st_size, 5);
-#if SIZEOF_TIME_T < 8
-	TEST_EQUAL_UI(hdr.sb.st_mtime, INT32_MAX);
-#else
-	TEST_EQUAL_UI(hdr.sb.st_mtime, 8589934592L);
-#endif
+
+	if (sizeof(time_t) * CHAR_BIT < 64) {
+		TEST_EQUAL_UI(hdr.sb.st_mtime, INT32_MAX);
+	} else {
+		TEST_EQUAL_UI(hdr.sb.st_mtime, 8589934592L);
+	}
+
 	TEST_EQUAL_UI(hdr.mtime, 8589934592L);
 	TEST_STR_EQUAL(hdr.name, "input.txt");
 	TEST_ASSERT(!hdr.unknown_record);
diff --git a/tests/tar_ustar.c b/tests/tar_ustar.c
index 8d4c828..b794e30 100644
--- a/tests/tar_ustar.c
+++ b/tests/tar_ustar.c
@@ -110,11 +110,13 @@ int main(void)
 	TEST_EQUAL_UI(hdr.sb.st_uid, 01750);
 	TEST_EQUAL_UI(hdr.sb.st_gid, 01750);
 	TEST_EQUAL_UI(hdr.sb.st_size, 5);
-#if SIZEOF_TIME_T < 8
-	TEST_EQUAL_UI(hdr.sb.st_mtime, INT32_MAX);
-#else
-	TEST_EQUAL_UI(hdr.sb.st_mtime, 8589934592L);
-#endif
+
+	if (sizeof(time_t) * CHAR_BIT < 64) {
+		TEST_EQUAL_UI(hdr.sb.st_mtime, INT32_MAX);
+	} else {
+		TEST_EQUAL_UI(hdr.sb.st_mtime, 8589934592L);
+	}
+
 	TEST_EQUAL_UI(hdr.mtime, 8589934592L);
 	TEST_STR_EQUAL(hdr.name, "input.txt");
 	TEST_ASSERT(!hdr.unknown_record);
diff --git a/tests/test.h b/tests/test.h
index 4e05dac..7d38fd0 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -9,6 +9,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include <stdio.h>
 #include <errno.h>
 
-- 
cgit v1.2.3