Add printf tests, to be sure about mingw apparently false warnings

6 files changed, 83 insertions, 57 deletions

diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index 8b09ab3..c6a95cc 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -72,13 +72,13 @@ function buildall {
 }
 
 # Linux / OS X 64bit
-#buildall x86_64-pc-linux-gnu -m64
+buildall x86_64-pc-linux-gnu -m64
 
 # Linux / OS X 32bit
-#buildall x86_64-pc-linux-gnu -m32
+buildall x86_64-pc-linux-gnu -m32
 
 # Windows 32bit
 buildall i686-w64-mingw32 -mconsole "${MINGW_CFLAGS}" "-L${MINGW_BASE}/mingw-w64-i686/lib ${MINGW_LDFLAGS}"
 
 # Windows 64bit
-#buildall x86_64-w64-mingw32 -mconsole "${MINGW_CFLAGS}" "-L${MINGW_BASE}/mingw-w64-x86_64/lib ${MINGW_LDFLAGS}"
+buildall x86_64-w64-mingw32 -mconsole "${MINGW_CFLAGS}" "-L${MINGW_BASE}/mingw-w64-x86_64/lib ${MINGW_LDFLAGS}"
diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index a36bded..a09b444 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -366,28 +366,35 @@ public:
     CHECK_EQ(0, CmpDifferentBlockBytes(to, recon));
   }
 
- //////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
 
- void TestRandomNumbers() {
-   MTRandom rand;
-   int rounds = 1<<20;
-   uint64_t usum = 0;
-   uint64_t esum = 0;
+void TestPrintf() {
+  char buf[64];
+  xoff_t x = XOFF_T_MAX;
+  snprintf_func (buf, sizeof(buf), "[%"Q"u]", x);
+  XD3_ASSERT(strcmp (buf, "[18446744073709551615]") == 0);
+}
 
-   for (int i = 0; i < rounds; i++) {
-     usum += rand.Rand32();
-     esum += rand.ExpRand32(1024);
-   }
+void TestRandomNumbers() {
+  MTRandom rand;
+  int rounds = 1<<20;
+  uint64_t usum = 0;
+  uint64_t esum = 0;
+
+  for (int i = 0; i < rounds; i++) {
+    usum += rand.Rand32();
+    esum += rand.ExpRand32(1024);
+  }
 
-   double allowed_error = 0.01;
+  double allowed_error = 0.01;
 
-   uint32_t umean = usum / rounds;
-   uint32_t emean = esum / rounds;
+  uint32_t umean = usum / rounds;
+  uint32_t emean = esum / rounds;
 
-   uint32_t uexpect = UINT32_MAX / 2;
-   uint32_t eexpect = 1024;
+  uint32_t uexpect = UINT32_MAX / 2;
+  uint32_t eexpect = 1024;
 
-   if (umean < uexpect * (1.0 - allowed_error) ||
+  if (umean < uexpect * (1.0 - allowed_error) ||
       umean > uexpect * (1.0 + allowed_error)) {
     XPR(NT "uniform mean error: %u != %u\n", umean, uexpect);
     abort();
@@ -1245,6 +1252,7 @@ void TestLastFrontierBlock() {
 template <class T>
 void UnitTest() {
   Regtest<T> regtest;
+  TEST(TestPrintf);
   TEST(TestRandomNumbers);
   TEST(TestRandomFile);
   TEST(TestFirstByte);
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index b14408f..244192c 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -80,6 +80,25 @@ typedef enum
   XO_WRITE = 1
 } main_file_modes;
 
+#ifndef XD3_POSIX
+#define XD3_POSIX 0
+#endif
+#ifndef XD3_STDIO
+#define XD3_STDIO 0
+#endif
+#ifndef XD3_WIN32
+#define XD3_WIN32 0
+#endif
+#ifndef NOT_MAIN
+#define NOT_MAIN 0
+#endif
+
+/* If none are set, default to posix. */
+#if (XD3_POSIX + XD3_STDIO + XD3_WIN32) == 0
+#undef XD3_POSIX
+#define XD3_POSIX 1
+#endif
+
 struct _main_file
 {
 #if XD3_WIN32
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 875dd71..e3c4e86 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -49,19 +49,6 @@
 
 /*********************************************************************/
 
-#ifndef XD3_POSIX
-#define XD3_POSIX 0
-#endif
-#ifndef XD3_STDIO
-#define XD3_STDIO 0
-#endif
-#ifndef XD3_WIN32
-#define XD3_WIN32 0
-#endif
-#ifndef NOT_MAIN
-#define NOT_MAIN 0
-#endif
-
 /* Combines xd3_strerror() and strerror() */
 const char* xd3_mainerror(int err_num);
 
@@ -82,12 +69,6 @@ xsnprintf_func (char *str, int n, const char *fmt, ...)
   return ret;
 }
 
-/* If none are set, default to posix. */
-#if (XD3_POSIX + XD3_STDIO + XD3_WIN32) == 0
-#undef XD3_POSIX
-#define XD3_POSIX 1
-#endif
-
 /* Handle externally-compressed inputs. */
 #ifndef EXTERNAL_COMPRESSION
 #define EXTERNAL_COMPRESSION 1
@@ -1248,9 +1229,10 @@ main_set_secondary_flags (xd3_config *config)
  VCDIFF TOOLS
  *****************************************************************/
 
-#if VCDIFF_TOOLS
 #include "xdelta3-merge.h"
 
+#if VCDIFF_TOOLS
+
 /* The following macros let VCDIFF print using main_file_write(),
  * for example:
  *
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 659bd31..775da13 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -215,6 +215,16 @@ test_random_numbers (xd3_stream *stream, int ignore)
   return XD3_INTERNAL;
 }
 
+static int
+test_printf_xoff (xd3_stream *stream, int ignore)
+{
+  char buf[64];
+  xoff_t x = XOFF_T_MAX;
+  snprintf_func (buf, sizeof(buf), "[%"Q"u]", x);
+  XD3_ASSERT(strcmp (buf, "[18446744073709551615]") == 0);
+  return 0;
+}
+
 static void
 test_unlink (char* file)
 {
@@ -2852,6 +2862,7 @@ xd3_selftest (void)
 
   int ret;
   DO_TEST (random_numbers, 0, 0);
+  DO_TEST (printf_xoff, 0, 0);
 
   DO_TEST (decode_integer_end_of_input, 0, 0);
   DO_TEST (decode_integer_overflow, 0, 0);
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index b317203..3d230d6 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -131,7 +131,7 @@
 
 /* _MSV_VER is defined by Microsoft tools, not by mingw32 */
 #ifdef _MSC_VER
-#define inline
+/*#define inline*/
 typedef signed int     ssize_t;
 #if _MSC_VER < 1600
 typedef unsigned char  uint8_t;
@@ -162,8 +162,10 @@ typedef uint32_t usize_t;
 #define _FILE_OFFSET_BITS 64
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32)
 typedef uint64_t xoff_t;
+/* Note: The following generates benign warnings in a mingw
+ * cross-compiler */
 #define Q "I64"
 #elif SIZEOF_UNSIGNED_LONG == 8
 typedef unsigned long xoff_t;
@@ -174,32 +176,36 @@ typedef size_t xoff_t;
 #elif SIZEOF_UNSIGNED_LONG_LONG == 8
 typedef unsigned long long xoff_t;
 #define Q "ll"
-#endif
-
-#ifdef _WIN32
-#if SIZEOF_SIZE_T == 4
-#define Z ""
-#elif SIZEOF_SIZE_T == 8
-#define Z "I64"
-#endif
-#else
-#define Z "z"
-#endif
+#endif /* #define Q */
 
 #define SIZEOF_XOFF_T 8
-#define SIZEOF_USIZE_T 4
-#else
+
+#else /* XD3_USE_LARGEFILE64 == 0 */
+
 #if SIZEOF_UNSIGNED_INT == 4
 typedef unsigned int xoff_t;
+#elif SIZEOF_UNSIGNED_LONG == 4
+typedef unsigned long xoff_t;
 #else
 typedef uint32_t xoff_t;
-#endif
+#endif /* xoff_t is 32 bits */
 
 #define SIZEOF_XOFF_T 4
-#define SIZEOF_USIZE_T 4
 #define Q
+#endif /* 64 vs 32 bit xoff_t */
+
+/* Note: This gets modified in the 64bithash branch. */
+#define SIZEOF_USIZE_T 4
+
+#if SIZEOF_SIZE_T == 4
 #define Z
-#endif
+#elif SIZEOF_SIZE_T == 8
+#ifdef _WIN32
+#define Z "I64"
+#else /* !_WIN32 */
+#define Z "z"
+#endif /* Windows or not */
+#endif /* size_t printf flags */
 
 #define USE_UINT32 (SIZEOF_USIZE_T == 4 || \
                     SIZEOF_XOFF_T == 4 || REGRESSION_TEST)