From d1d6a2187d2388e4b1c1a0f05f1f6773401f1187 Mon Sep 17 00:00:00 2001
From: Dana Robinson <43805+derobins@users.noreply.github.com>
Date: Mon, 12 Jun 2023 12:18:23 -0700
Subject: Remove code paths where long long < 8 bytes (#3098)

The C99 standard says that a long long is 8+ bytes. This change
removes a few parts of the code where we assume that a long long
could be less than that.
---
 test/big.c    | 20 +-------------------
 test/ntypes.c | 15 +++------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/test/big.c b/test/big.c
index a008cef..503570d 100644
--- a/test/big.c
+++ b/test/big.c
@@ -11,12 +11,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke
- *              Wednesday, April  8, 1998
- * Modified:    Albert Cheng
- *         September 11, 2010
- */
-/*
  * The purpose of this test is to verify if a virtual file driver can handle:
  *    a. Large file (2GB)
  *    This should exceed 32bits I/O system since offset is a signed
@@ -62,12 +56,6 @@
 
 #define MAX_TRIES 100
 
-#if H5_SIZEOF_LONG_LONG >= 8
-#define GB8LL ((unsigned long long)8 * 1024 * 1024 * 1024)
-#else
-#define GB8LL 0 /*cannot do the test*/
-#endif
-
 /* Define Small, Large, Extra Large, Huge File which
  * correspond to less than 2GB, 2GB, 4GB, and tens of GB file size.
  * NO_FILE stands for "no file" to be tested.
@@ -330,7 +318,7 @@ static int
 writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n)
 {
     hsize_t size1[4] = {8, 1024, 1024, 1024};
-    hsize_t size2[1] = {GB8LL};
+    hsize_t size2[1] = {8LL * 1024LL * 1024LL * 1024LL};
     hsize_t hs_start[1];
     hsize_t hs_size[1];
     hid_t   file = -1, space1 = -1, space2 = -1, mem_space = -1, d1 = -1, d2 = -1;
@@ -689,12 +677,6 @@ test_family(hid_t fapl)
          * because we would generate multi-gigabyte files.
          */
         HDputs("Checking if file system is adequate for this test...");
-        if (sizeof(long long) < 8 || 0 == GB8LL) {
-            HDputs("Test skipped because sizeof(long long) is too small. This");
-            HDputs("hardware apparently doesn't support 64-bit integer types.");
-            usage();
-            goto quit;
-        }
         if (!sparse_support) {
             HDputs("Test skipped because file system does not support holes.");
             usage();
diff --git a/test/ntypes.c b/test/ntypes.c
index 92b2896..707c71d 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -381,10 +381,7 @@ test_compound_dtype2(hid_t file)
 #else
 #error "Unknown 'long' size"
 #endif
-#if H5_SIZEOF_LONG_LONG == 4
-    if (H5Tinsert(tid2, "ll2", HOFFSET(s2, ll2), H5T_STD_I32BE) < 0)
-        TEST_ERROR;
-#elif H5_SIZEOF_LONG_LONG == 8
+#if H5_SIZEOF_LONG_LONG == 8
     if (H5Tinsert(tid2, "ll2", HOFFSET(s2, ll2), H5T_STD_I64BE) < 0)
         TEST_ERROR;
 #else
@@ -397,10 +394,7 @@ test_compound_dtype2(hid_t file)
         TEST_ERROR;
     if (H5Tinsert(tid, "st", HOFFSET(s1, st), tid2) < 0)
         TEST_ERROR;
-#if H5_SIZEOF_LONG_LONG == 4
-    if (H5Tinsert(tid, "l", HOFFSET(s1, l), H5T_STD_U32BE) < 0)
-        TEST_ERROR;
-#elif H5_SIZEOF_LONG_LONG == 8
+#if H5_SIZEOF_LONG_LONG == 8
     if (H5Tinsert(tid, "l", HOFFSET(s1, l), H5T_STD_U64BE) < 0)
         TEST_ERROR;
 #else
@@ -532,10 +526,7 @@ test_compound_dtype2(hid_t file)
         TEST_ERROR;
     if (H5Tget_order(mem_id) != H5Tget_order(H5T_NATIVE_LLONG))
         TEST_ERROR;
-#if H5_SIZEOF_LONG_LONG == 4
-    if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I32LE))
-        TEST_ERROR;
-#elif H5_SIZEOF_LONG_LONG == 8
+#if H5_SIZEOF_LONG_LONG == 8
     if (H5Tget_size(mem_id) < H5Tget_size(H5T_STD_I64LE))
         TEST_ERROR;
 #else
-- 
cgit v0.12