Build fixes w/ XD3_DEBUG=9 and Clang -Weverything

13 files changed, 102 insertions, 89 deletions

diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index f437764..056b200 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -45,12 +45,26 @@ xdelta3checksum_SOURCES = $(common_SOURCES) \
 # Note: for extra sanity checks, enable -Wconversion. Note there
 # are a lot of false positives.
 WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \
-         -Wno-unused-parameter -Wformat -Wno-unused-function # -Wconversion
+         -Wformat=2 -Wno-format-nonliteral \
+         -Wno-unused-parameter -Wno-unused-function
+
+ # -Weverything \
+ # -Wc++11-compat-reserved-user-defined-literal \
+ # -Wno-padded \
+ # -Wno-format-nonliteral \
+ # -Wno-cast-align \
+ # -Wno-unused-parameter \
+ # -Wno-sign-conversion \
+ # -Wno-conversion \
+ # -Wno-switch-enum \
+ # -Wno-covered-switch-default \
+ # -Wno-disabled-macro-expansion \
+ # -Wno-variadic-macros \
+ # -Wno-c++98-compat-pedantic
 
 C_WFLAGS = $(WFLAGS) -pedantic -std=c99
-CXX_WFLAGS = $(WFLAGS)
+CXX_WFLAGS = $(WFLAGS) -pedantic -std=c++11
 
-# TODO add -O3
 common_CFLAGS = \
               -DREGRESSION_TEST=1 \
               -DSECONDARY_DJW=1 \
diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index eb08afc..a6933b5 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -82,6 +82,8 @@ function buildlzma {
         --host=${host} \
         --prefix=${target} \
         --disable-shared \
+        "CC=${CC}" \
+        "CXX=${CXX}" \
         "CFLAGS=${march}" \
         "CXXFLAGS=${march}" \
         "LDFLAGS=${march}"
diff --git a/xdelta3/testing/delta.h b/xdelta3/testing/delta.h
index f874bf2..deac217 100644
--- a/xdelta3/testing/delta.h
+++ b/xdelta3/testing/delta.h
@@ -30,7 +30,7 @@ public:
       case XD3_WINFINISH:
         break;
       default:
-        DP(RINT "error code %s\n", xd3_strerror (ret));
+        cerr << "decode: " << done;
         abort();
       }
     }
@@ -48,23 +48,25 @@ public:
     return stream_.whole_target.wininfolen;
   }
 
-  void Print() const {
-    for (size_t i = 0; i < stream_.whole_target.instlen; i++) {
-      xd3_winst &winst = stream_.whole_target.inst[i];
-      switch (winst.type) {
-      case XD3_RUN: 
-        DP(RINT "%"Q" run %u\n", winst.position, winst.size);
-        break;
-      case XD3_ADD: 
-        DP(RINT "%"Q" add %u\n", winst.position, winst.size);
-        break;
-      default:
-        DP(RINT "%"Q" copy %u @ %"Q" (mode %u)\n", 
-           winst.position, winst.size, winst.addr, winst.mode);
-        break;
-      }
-    }
-  }
+// Note: This does not benefit from -Wformat= checking, due to the
+// enclosing template. Further, it was not used.
+// void Print() const {
+//     for (size_t i = 0; i < stream_.whole_target.instlen; i++) {
+//       xd3_winst &winst = stream_.whole_target.inst[i];
+//       switch (winst.type) {
+//       case XD3_RUN: 
+//      DP(RINT, "%" Q "u run %" W "u\n", winst.position, winst.size);
+//      break;
+//       case XD3_ADD: 
+//      DP(RINT "%" Q "u add %" W "u\n", winst.position, winst.size);
+//      break;
+//       default:
+//      DP(RINT "%" Q "u copy %" W "u @ %" Q "u (mode %u)\n", 
+//         winst.position, winst.size, winst.addr, winst.mode);
+//      break;
+//       }
+//     }
+//   }
 
 private:
   xd3_stream stream_;
diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index c6f3c7b..eb40e51 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -62,20 +62,22 @@ public:
     size_ = 0;
   }
 
-  void Print() const {
-    xoff_t pos = 0;
-    for (size_t i = 0; i < Size(); i++) {
-      if (pos % 16 == 0) {
-        DP(RINT "%5"Q"x: ", pos);
-      }
-      DP(RINT "%02x ", (*this)[i]);
-      if (pos % 16 == 15) {
-        DP(RINT "\n");
-      }
-      pos++;
-    }
-    DP(RINT "\n");
-  }
+  // Note: This does not benefit from -Wformat= checking, due to the
+  // enclosing template. Further, it was not used.
+  // void Print() const {
+  //   xoff_t pos = 0;
+  //   for (size_t i = 0; i < Size(); i++) {
+  //     if (pos % 16 == 0) {
+  //    DP(RINT "%5" Q "x: ", pos);
+  //     }
+  //     DP(RINT "%02x ", (*this)[i]);
+  //     if (pos % 16 == 15) {
+  //    DP(RINT "\n");
+  //     }
+  //     pos++;
+  //   }
+  //   DP(RINT "\n");
+  // }
 
   void WriteTmpFile(TmpFile *f) const {
     f->Append(this);
diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index e83af4b..e5895e0 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -92,22 +92,24 @@ public:
     bool done = false;
     bool done_after_input = false;
 
-    IF_DEBUG1 (XPR(NTR "source %"Q"u[%"Q"u] target %"Q"u winsize %"Z"u\n",
-                  source_file.Size(), options.block_size,
-                  target_file.Size(),
-                  Constants::WINDOW_SIZE));
+    IF_DEBUG1 (XPR(NTR "source %" Q "u[%" Z "u] target %" Q "u winsize %" Z "u\n",
+                   source_file.Size(), options.block_size,
+                   target_file.Size(),
+                   Constants::WINDOW_SIZE));
 
     while (!done) {
       target_iterator.Get(&target_block);
 
       xoff_t blks = target_iterator.Blocks();
 
-      IF_DEBUG2(XPR(NTR "target in %s: %"Q"..%"Q" %"Q"(%"Q") "
-                    "verified %"Q"\n",
-                   encoding ? "encoding" : "decoding",
-                   target_iterator.Offset(),
-                   target_iterator.Offset() + target_block.Size(),
-                   target_iterator.Blkno(), blks, verified_bytes));
+      IF_DEBUG2(XPR(NTR "target in %s: %" Q "u..%" Q "u %" Q "u(%" Q "u) "
+                    "verified %" Q "u\n",
+                    encoding ? "encoding" : "decoding",
+                    target_iterator.Offset(),
+                    target_iterator.Offset() + target_block.Size(),
+                    target_iterator.Blkno(),
+                    blks,
+                    verified_bytes));
 
       if (blks == 0 || target_iterator.Blkno() == (blks - 1)) {
         xd3_set_flags(&encode_stream, XD3_FLUSH | encode_stream.flags);
@@ -153,8 +155,8 @@ public:
         xd3_source *src = (encoding ? &encode_source : &decode_source);
         Block *block = (encoding ? &encode_source_block : &decode_source_block);
         if (encoding) {
-          IF_DEBUG2(XPR(NTR "[srcblock] %"Q"u last srcpos %"Q"u "
-                        "encodepos %"Q"u\n",
+          IF_DEBUG2(XPR(NTR "[srcblock] %" Q "u last srcpos %" Q "u "
+                        "encodepos %" Q "u\n",
                         encode_source.getblkno,
                         encode_stream.match_last_srcpos,
                         encode_stream.input_position + encode_stream.total_in));
@@ -231,7 +233,7 @@ public:
                         const Options &options) {
     vector<const char*> ecmd;
     char bbuf[16];
-    snprintf(bbuf, sizeof(bbuf), "-B%"Q"u", options.encode_srcwin_maxsz);
+    snprintf(bbuf, sizeof(bbuf), "-B%" Q "u", options.encode_srcwin_maxsz);
     ecmd.push_back("xdelta3");
     ecmd.push_back(bbuf);
     ecmd.push_back("-s");
@@ -371,7 +373,7 @@ public:
 void TestPrintf() {
   char buf[64];
   xoff_t x = XOFF_T_MAX;
-  snprintf_func (buf, sizeof(buf), "%"Q"u", x);
+  snprintf_func (buf, sizeof(buf), "%" Q "u", x);
   const char *expect = XD3_USE_LARGEFILE64 ?
     "18446744073709551615" : "4294967295";
   XD3_ASSERT(strcmp (buf, expect) == 0);
@@ -696,8 +698,9 @@ void TestOverwriteMutator() {
   CHECK(memcmp(b0.Data() + 30, b1.Data() + 30,
                Constants::BLOCK_SIZE - 30) == 0);
 
+  xoff_t zero = 0;
   cl1.clear();
-  cl1.push_back(Change(Change::COPYOVER, 10, 20, (xoff_t)0));
+  cl1.push_back(Change(Change::COPYOVER, 10, 20, zero));
   spec0.ModifyTo(ChangeListMutator(cl1), &spec1);
   CHECK_EQ(spec0.Size(), spec1.Size());
 
@@ -813,7 +816,7 @@ void TestSmallStride() {
     InMemoryEncodeDecode(spec0, spec1, &block, options);
     Delta delta(block);
 
-    IF_DEBUG1(DP(RINT "[stride=%d] changes=%u adds=%"Q"u\n",
+    IF_DEBUG1(DP(RINT "[stride=%d] changes=%u adds=%" Q "u\n",
                  s, changes, delta.AddedBytes()));
     double allowance = Constants::BLOCK_SIZE < 8192 || s < 30 ? 3.0 : 1.1;
     CHECK_GE(allowance * changes, (double)delta.AddedBytes());
@@ -1259,7 +1262,7 @@ void UnitTest() {
 // These are Xdelta tests.
 template <class T>
 void MainTest() {
-  XPR(NT "Blocksize %"Q"u windowsize %"Z"u\n",
+  XPR(NT "Blocksize %" Q "u windowsize %" Z "u\n",
       T::BLOCK_SIZE, T::WINDOW_SIZE);
   Regtest<T> regtest;
   TEST(TestEmptyInMemory);
diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h
index e71b624..bce5956 100644
--- a/xdelta3/xdelta3-decode.h
+++ b/xdelta3/xdelta3-decode.h
@@ -288,8 +288,8 @@ xd3_decode_parse_halfinst (xd3_stream *stream, xd3_hinst *inst)
     {
       IF_DEBUG2 ({
         static int cnt = 0;
-        XPR(NT "DECODE:%u: COPY at %"Q" (winoffset %"Z") "
-            "size %"Z" winaddr %"Z"\n",
+        XPR(NT "DECODE:%u: COPY at %"Q"u (winoffset %"W"u) "
+            "size %"W"u winaddr %"W"u\n",
             cnt++,
             stream->total_out + (stream->dec_position -
                                  stream->dec_cpylen),
@@ -330,7 +330,7 @@ xd3_decode_parse_halfinst (xd3_stream *stream, xd3_hinst *inst)
         if (inst->type == XD3_ADD)
           {
             static int cnt;
-            XPR(NT "DECODE:%d: ADD at %"Q" (winoffset %"Z") size %"Z"\n",
+            XPR(NT "DECODE:%d: ADD at %"Q"u (winoffset %"W"u) size %"W"u\n",
                cnt++,
                (stream->total_out + stream->dec_position - stream->dec_cpylen),
                stream->dec_position - stream->dec_cpylen,
@@ -340,7 +340,7 @@ xd3_decode_parse_halfinst (xd3_stream *stream, xd3_hinst *inst)
           {
             static int cnt;
             XD3_ASSERT (inst->type == XD3_RUN);
-            XPR(NT "DECODE:%d: RUN at %"Q" (winoffset %"Z") size %"Z"\n",
+            XPR(NT "DECODE:%d: RUN at %"Q"u (winoffset %"W"u) size %"W"u\n",
                cnt++,
                stream->total_out + stream->dec_position - stream->dec_cpylen,
                stream->dec_position - stream->dec_cpylen,
@@ -526,8 +526,8 @@ xd3_decode_output_halfinst (xd3_stream *stream, xd3_hinst *inst)
                 if ((source->onblk != blksize) &&
                     (blkoff + take > source->onblk))
                   {
-                    IF_DEBUG1 (XPR(NT "[srcfile] short at blkno %"Q" onblk "
-                                   "%"Z" blksize %"Z" blkoff %"Z" take %"Z"\n",
+                    IF_DEBUG1 (XPR(NT "[srcfile] short at blkno %"Q"u onblk "
+                                   "%"W"u blksize %"W"u blkoff %"W"u take %"W"u\n",
                                    block,
                                    source->onblk,
                                    blksize,
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index e9fc5f3..e0c561f 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -64,7 +64,7 @@ xd3_output* xd3_alloc_output (xd3_stream *stream,
 
 int xd3_encode_init_full (xd3_stream *stream);
 usize_t xd3_pow2_roundup (usize_t x);
-long get_millisecs_now ();
+long get_millisecs_now (void);
 int xd3_process_stream (int            is_encode,
                         xd3_stream    *stream,
                         int          (*func) (xd3_stream *),
@@ -153,15 +153,12 @@ typedef struct {
 
 /* Prior to SVN 303 this function was only defined in DJGPP and WIN32
  * environments and other platforms would use the builtin snprintf()
- * with an arrangement of macros below.  In OS X 10.6, Apply made
+ * with an arrangement of macros below.  In OS X 10.6, Apple made
  * snprintf() a macro, which defeated those macros (since snprintf
  * would be evaluated before its argument macros were expanded,
  * therefore always define xsnprintf_func. */
-#undef PRINTF_ATTRIBUTE
-#ifdef __GNUC__
+#ifndef PRINTF_ATTRIBUTE
 #define PRINTF_ATTRIBUTE(x,y) __attribute__ ((__format__ (__printf__, x, y)))
-#else
-#define PRINTF_ATTRIBUTE(x,y)
 #endif
 
 /* Underlying xprintf() */
diff --git a/xdelta3/xdelta3-lzma.h b/xdelta3/xdelta3-lzma.h
index de317ee..6c16a7e 100644
--- a/xdelta3/xdelta3-lzma.h
+++ b/xdelta3/xdelta3-lzma.h
@@ -32,13 +32,13 @@ struct _xd3_lzma_stream {
   lzma_filter filters[2];
 };
 
-xd3_sec_stream* 
+static xd3_sec_stream* 
 xd3_lzma_alloc (xd3_stream *stream)
 {
   return (xd3_sec_stream*) xd3_alloc (stream, sizeof (xd3_lzma_stream), 1);
 }
 
-void
+static void
 xd3_lzma_destroy (xd3_stream *stream, xd3_sec_stream *sec_stream)
 {
   xd3_lzma_stream *ls = (xd3_lzma_stream*) sec_stream;
@@ -46,7 +46,7 @@ xd3_lzma_destroy (xd3_stream *stream, xd3_sec_stream *sec_stream)
   xd3_free (stream, ls);
 }
 
-int
+static int
 xd3_lzma_init (xd3_stream *stream, xd3_lzma_stream *sec, int is_encode)
 {
   int ret;
@@ -84,7 +84,7 @@ xd3_lzma_init (xd3_stream *stream, xd3_lzma_stream *sec, int is_encode)
   return 0;
 }
 
-int xd3_decode_lzma (xd3_stream *stream, xd3_lzma_stream *sec,
+static int xd3_decode_lzma (xd3_stream *stream, xd3_lzma_stream *sec,
                      const uint8_t **input_pos,
                      const uint8_t  *const input_end,
                      uint8_t       **output_pos,
@@ -125,7 +125,7 @@ int xd3_decode_lzma (xd3_stream *stream, xd3_lzma_stream *sec,
 
 #if XD3_ENCODER
 
-int xd3_encode_lzma (xd3_stream *stream, 
+static int xd3_encode_lzma (xd3_stream *stream, 
                      xd3_lzma_stream *sec, 
                      xd3_output   *input,
                      xd3_output   *output,
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 1a3d95e..69330ca 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -320,7 +320,7 @@ static int xd3_merge_input_output (xd3_stream *stream,
  * comments there. */
 #include "xdelta3-blkcache.h"
 
-void (*xprintf_message_func)(const char*msg) = NULL;
+static void (*xprintf_message_func)(const char*msg) = NULL;
 
 void
 xprintf (const char *fmt, ...)
@@ -1985,8 +1985,8 @@ main_merge_output (xd3_stream *stream, main_file *ofile)
                   addr = inst->addr - window_start;
                 }
               IF_DEBUG2 ({
-                  XPR(NTR "[merge copy] winpos %"W" take %"W" "
-                      "addr %"Q" mode %u\n",
+                  XPR(NTR "[merge copy] winpos %"W"u take %"W"u "
+                      "addr %"Q"u mode %u\n",
                       window_pos, take, addr, inst->mode);
                 });
               if ((ret = xd3_found_match (recode_stream, window_pos, take,
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index a09f814..6e46a3d 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -258,8 +258,8 @@ xd3_whole_append_window (xd3_stream *stream)
 
 /* xd3_merge_input_output applies *source to *stream, returns the
  * result in stream. */
-int xd3_merge_input_output (xd3_stream *stream,
-                            xd3_whole_state *source)
+static int xd3_merge_input_output (xd3_stream *stream,
+                                   xd3_whole_state *source)
 {
   int ret;
   xd3_stream tmp_stream;
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 335de28..7ecaaaf 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -1588,7 +1588,7 @@ static int
 test_checksum_step (xd3_stream *stream, int ignore)
 {
   const int bufsize = 128;
-  uint8_t buf[bufsize];
+  uint8_t buf[128];
   for (int i = 0; i < bufsize; i++)
     {
       buf[i] = mt_random (&static_mtrand) & 0xff;
@@ -2095,7 +2095,7 @@ test_recode_command (xd3_stream *stream, int ignore)
 }
 
 #if SECONDARY_LZMA
-int test_secondary_lzma_default (xd3_stream *stream, int ignore)
+static int test_secondary_lzma_default (xd3_stream *stream, int ignore)
 {
   char ecmd[TESTBUFSIZE];
   int ret;
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 9253d68..b0c9b30 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -369,10 +369,6 @@ XD3_MAKELIST(xd3_rlist, xd3_rinst, link);
 #define VCD_SELF       0     /* 1st address mode */
 #define VCD_HERE       1     /* 2nd address mode */
 
-#define CODE_TABLE_STRING_SIZE (6 * 256) /* Should fit a code table string. */
-#define CODE_TABLE_VCDIFF_SIZE (6 * 256) /* Should fit a compressed code
-                                          * table string */
-
 #define SECONDARY_ANY (SECONDARY_DJW || SECONDARY_FGK || SECONDARY_LZMA)
 
 #define ALPHABET_SIZE      256  /* Used in test code--size of the secondary
@@ -381,9 +377,6 @@ XD3_MAKELIST(xd3_rlist, xd3_rinst, link);
 #define HASH_CKOFFSET      1U   /* Table entries distinguish "no-entry" from
                                  * offset 0 using this offset. */
 
-#define MIN_SMALL_LOOK    2U    /* Match-optimization stuff. */
-#define MIN_LARGE_LOOK    2U
-#define MIN_MATCH_OFFSET  1U
 #define MAX_MATCH_SPLIT   18U   /* VCDIFF code table: 18 is the default limit
                                  * for direct-coded ADD sizes */
 
@@ -395,7 +388,6 @@ XD3_MAKELIST(xd3_rlist, xd3_rinst, link);
                                * between them.  0. */
 
 #define MIN_MATCH         4U  /* VCDIFF code table: MIN_MATCH=4 */
-#define MIN_ADD           1U  /* 1 */
 #define MIN_RUN           8U  /* The shortest run, if it is shorter than this
                                * an immediate add/copy will be just as good.
                                * ADD1/COPY6 = 1I+1D+1A bytes, RUN18 =
@@ -416,8 +408,6 @@ XD3_MAKELIST(xd3_rlist, xd3_rinst, link);
 #define INST_HEAD(s) ((s)->enc_heads[2])
 #define ADDR_HEAD(s) ((s)->enc_heads[3])
 
-#define TOTAL_MODES(x) (2+(x)->acache.s_same+(x)->acache.s_near)
-
 /* Template instances. */
 #if XD3_BUILD_SLOW
 #define IF_BUILD_SLOW(x) x
@@ -4482,10 +4472,9 @@ xd3_srcwin_move_point (xd3_stream *stream, usize_t *next_move_point)
     }
 
   IF_DEBUG1 (DP(RINT
-                "[srcwin_move_point] exited loop T=%"Q"{%"Q"} "
+                "[srcwin_move_point] exited loop T=%"Q"u "
                 "S=%"Q" EOF=%"Q" %s\n",
                 stream->total_in + stream->input_position,
-                logical_input_cksum_pos,
                 stream->srcwin_cksum_pos,
                 xd3_source_eof (stream->src),
                 stream->src->eof_known ? "known" : "unknown"));
@@ -4577,7 +4566,7 @@ XD3_TEMPLATE(xd3_string_match_) (xd3_stream *stream)
   int            ret;
   usize_t        match_length;
   usize_t        match_offset = 0;
-  usize_t        next_move_point;
+  usize_t        next_move_point = 0;
 
   IF_DEBUG2(DP(RINT "[string_match] initial entry %u\n", stream->input_position));
 
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 1b134eb..e440f70 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -298,6 +298,10 @@ typedef uint32_t usize_t;
 #define SWIG_MODULE 0
 #endif
 
+#ifndef NOT_MAIN
+#define NOT_MAIN 0
+#endif
+
 /* There are three string matching functions supplied: one fast, one
  * slow (default), and one soft-configurable.  To disable any of
  * these, use the following definitions. */