CURL_LLONG_MAX: avoid constant overflow

... when (CURL_SIZEOF_CURL_OFF_T == 4)

diff --git a/lib/strtoofft.h b/lib/strtoofft.h
index bf27a173cb534b6efd152b4280c2118c458cb15f..c791bc96e827cad420e4175fc084194e381bfdbc 100644 (file)
--- a/lib/strtoofft.h
+++ b/lib/strtoofft.h
@@ -57,7 +57,12 @@
 #  define curlx_strtoofft strtol
 #endif
 
-#define CURL_LLONG_MAX CURL_OFF_T_C(0x7FFFFFFFFFFFFFFF)
+#if (CURL_SIZEOF_CURL_OFF_T == 4)
+#  define CURL_LLONG_MAX CURL_OFF_T_C(0x7FFFFFFF)
+#else
+   /* assume CURL_SIZEOF_CURL_OFF_T == 8 */
+#  define CURL_LLONG_MAX CURL_OFF_T_C(0x7FFFFFFFFFFFFFFF)
+#endif
 #define CURL_LLONG_MIN (-CURL_LLONG_MAX - CURL_OFF_T_C(1))
 
 #endif /* HEADER_CURL_STRTOOFFT_H */

diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c
index 7f2c7ae37d0cd5c8ba6d832c4faa75d60dbe286b..10857f6b7255b24c609cab71f0e4ff3667ba6ae1 100644 (file)
--- a/tests/libtest/lib576.c
+++ b/tests/libtest/lib576.c
@@ -33,7 +33,7 @@ long chunk_bgn(const struct curl_fileinfo *finfo, void *ptr, int remains)
       printf(" (parsed => %o)", finfo->perm);
     printf("\n");
   }
-  printf("Size:         %lldB\n", (long long int)finfo->size);
+  printf("Size:         %ldB\n", (long)finfo->size);
   if(finfo->strings.user)
     printf("User:         %s\n", finfo->strings.user);
   if(finfo->strings.group)