Merge pull request #60 from jonathonf/large-files

Make OFF_T_PF less flaky

Author: TheAssassin

src/format_string.h

@@ -21,17 +21,8 @@
 # define SIZE_T_PF "%u"
 #endif
 
-#if SIZEOF_OFF_T == 8
-# ifdef PRIu64
-#  define OFF_T_PF "%" PRIu64
-# else
-#  define OFF_T_PF "%llu"
-# endif
+#ifdef PRIu64
+# define OFF_T_PF "%" PRIu64
 #else
-# ifdef PRIu32
-#  define OFF_T_PF "%" PRIu32
-# else
-#  define OFF_T_PF "%lu"
-# endif
+# define OFF_T_PF "%llu"
 #endif
-

src/legacy_http.c

@@ -571,7 +571,7 @@ int range_fetch_read_http_headers(struct range_fetch *rf) {
         p += 2;
         buflwr(buf);
         {   /* Remove the trailing \r\n from the value */
-            int len = strcspn(p, "\r\n");
+            uint64_t len = strcspn(p, "\r\n");
             p[len] = 0;
         }
         /* buf is the header name (lower-cased), p the value */