8 files changed, 55 insertions, 144 deletions

diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index fe0bd85..3cba9af 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -44,7 +44,7 @@ common_CFLAGS = \
               -DXD3_USE_LARGEFILE64=1 \
               -DXD3_MAIN=1
 
-xdelta3_CFLAGS = $(WFLAGS) $(common_CFLAGS) 
+xdelta3_CFLAGS = $(WFLAGS) $(common_CFLAGS) -pedantic -std=c99
 
 xdelta3regtest_CXXFLAGS = $(WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1
 xdelta3regtest_CFLAGS = $(WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1
diff --git a/xdelta3/testing/modify.h b/xdelta3/testing/modify.h
index ca83c21..d4698e3 100644
--- a/xdelta3/testing/modify.h
+++ b/xdelta3/testing/modify.h
@@ -15,7 +15,7 @@ public:
     DELETE = 3,     // Delete a specified range of data
     COPY = 4,       // Copy from one region, inserting elsewhere
     MOVE = 5,       // Copy then delete copied-from range
-    OVERWRITE = 6,  // Copy then delete copied-to range
+    OVERWRITE = 6   // Copy then delete copied-to range
 
     // ADD, DELETE, and COPY change the file size
     // MODIFY, MOVE, OVERWRITE preserve the file size
diff --git a/xdelta3/testing/random.h b/xdelta3/testing/random.h
index 65fabbd..d1a6840 100644
--- a/xdelta3/testing/random.h
+++ b/xdelta3/testing/random.h
@@ -9,7 +9,7 @@ class MTRandom {
  public:
   enum Constants { 
     MT_LEN = 624,
-    MT_IA = 397,
+    MT_IA = 397
   };
 
   static const uint32_t TEST_SEED1;
diff --git a/xdelta3/xdelta3-hash.h b/xdelta3/xdelta3-hash.h
index 8a5e5b2..e546d59 100644
--- a/xdelta3/xdelta3-hash.h
+++ b/xdelta3/xdelta3-hash.h
@@ -46,43 +46,7 @@ static const uint32_t hash_multiplier = 1597334677U;
 #else
 #define PERMUTE(x) (__single_hash[(uint32_t)x])
 
-static const uint16_t __single_hash[256] =
-{
-  /* Random numbers generated using SLIB's pseudo-random number generator.
-   * This hashes the input alphabet. */
-  0xbcd1, 0xbb65, 0x42c2, 0xdffe, 0x9666, 0x431b, 0x8504, 0xeb46,
-  0x6379, 0xd460, 0xcf14, 0x53cf, 0xdb51, 0xdb08, 0x12c8, 0xf602,
-  0xe766, 0x2394, 0x250d, 0xdcbb, 0xa678, 0x02af, 0xa5c6, 0x7ea6,
-  0xb645, 0xcb4d, 0xc44b, 0xe5dc, 0x9fe6, 0x5b5c, 0x35f5, 0x701a,
-  0x220f, 0x6c38, 0x1a56, 0x4ca3, 0xffc6, 0xb152, 0x8d61, 0x7a58,
-  0x9025, 0x8b3d, 0xbf0f, 0x95a3, 0xe5f4, 0xc127, 0x3bed, 0x320b,
-  0xb7f3, 0x6054, 0x333c, 0xd383, 0x8154, 0x5242, 0x4e0d, 0x0a94,
-  0x7028, 0x8689, 0x3a22, 0x0980, 0x1847, 0xb0f1, 0x9b5c, 0x4176,
-  0xb858, 0xd542, 0x1f6c, 0x2497, 0x6a5a, 0x9fa9, 0x8c5a, 0x7743,
-  0xa8a9, 0x9a02, 0x4918, 0x438c, 0xc388, 0x9e2b, 0x4cad, 0x01b6,
-  0xab19, 0xf777, 0x365f, 0x1eb2, 0x091e, 0x7bf8, 0x7a8e, 0x5227,
-  0xeab1, 0x2074, 0x4523, 0xe781, 0x01a3, 0x163d, 0x3b2e, 0x287d,
-  0x5e7f, 0xa063, 0xb134, 0x8fae, 0x5e8e, 0xb7b7, 0x4548, 0x1f5a,
-  0xfa56, 0x7a24, 0x900f, 0x42dc, 0xcc69, 0x02a0, 0x0b22, 0xdb31,
-  0x71fe, 0x0c7d, 0x1732, 0x1159, 0xcb09, 0xe1d2, 0x1351, 0x52e9,
-  0xf536, 0x5a4f, 0xc316, 0x6bf9, 0x8994, 0xb774, 0x5f3e, 0xf6d6,
-  0x3a61, 0xf82c, 0xcc22, 0x9d06, 0x299c, 0x09e5, 0x1eec, 0x514f,
-  0x8d53, 0xa650, 0x5c6e, 0xc577, 0x7958, 0x71ac, 0x8916, 0x9b4f,
-  0x2c09, 0x5211, 0xf6d8, 0xcaaa, 0xf7ef, 0x287f, 0x7a94, 0xab49,
-  0xfa2c, 0x7222, 0xe457, 0xd71a, 0x00c3, 0x1a76, 0xe98c, 0xc037,
-  0x8208, 0x5c2d, 0xdfda, 0xe5f5, 0x0b45, 0x15ce, 0x8a7e, 0xfcad,
-  0xaa2d, 0x4b5c, 0xd42e, 0xb251, 0x907e, 0x9a47, 0xc9a6, 0xd93f,
-  0x085e, 0x35ce, 0xa153, 0x7e7b, 0x9f0b, 0x25aa, 0x5d9f, 0xc04d,
-  0x8a0e, 0x2875, 0x4a1c, 0x295f, 0x1393, 0xf760, 0x9178, 0x0f5b,
-  0xfa7d, 0x83b4, 0x2082, 0x721d, 0x6462, 0x0368, 0x67e2, 0x8624,
-  0x194d, 0x22f6, 0x78fb, 0x6791, 0xb238, 0xb332, 0x7276, 0xf272,
-  0x47ec, 0x4504, 0xa961, 0x9fc8, 0x3fdc, 0xb413, 0x007a, 0x0806,
-  0x7458, 0x95c6, 0xccaa, 0x18d6, 0xe2ae, 0x1b06, 0xf3f6, 0x5050,
-  0xc8e8, 0xf4ac, 0xc04c, 0xf41c, 0x992f, 0xae44, 0x5f1b, 0x1113,
-  0x1738, 0xd9a8, 0x19ea, 0x2d33, 0x9698, 0x2fe9, 0x323f, 0xcde2,
-  0x6d71, 0xe37d, 0xb697, 0x2c4f, 0x4373, 0x9102, 0x075d, 0x8e25,
-  0x1672, 0xec28, 0x6acb, 0x86cc, 0x186e, 0x9414, 0xd674, 0xd1a5
-};
+extern const uint16_t __single_hash[256];
 #endif
 
 /* Update the checksum state. */
@@ -98,7 +62,7 @@ xd3_large_cksum_update (uint32_t cksum,
   return (high << 16) | low;
 }
 #else
-// TODO: revisit this topic
+/* TODO: revisit this topic */
 #endif
 
 /* Note: small cksum is hard-coded for 4 bytes */
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index d134564..fd01208 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -56,7 +56,7 @@ int xd3_main_cmdline (int argc, char **argv);
 typedef enum
 {
   XO_READ  = 0,
-  XO_WRITE = 1,
+  XO_WRITE = 1
 } main_file_modes;
 
 struct _main_file
diff --git a/xdelta3/xdelta3-tmp.prj b/xdelta3/xdelta3-tmp.prj
deleted file mode 100644
index d29725e..0000000
--- a/xdelta3/xdelta3-tmp.prj
+++ /dev/null
@@ -1,72 +0,0 @@
-;; -*- Prcs -*-
-(Created-By-Prcs-Version 1 3 4)
-(Project-Description "")
-(Project-Version xdelta3-tmp 0 1)
-(Parent-Version -*- -*- -*-)
-(Version-Log "")
-(New-Version-Log "")
-(Checkin-Time "Sun, 09 Jan 2011 00:28:29 -0800")
-(Checkin-Login jmacd)
-(Populate-Ignore ("\\.svn" "\\.o" "\\.gz" ".dSYM"))
-(Project-Keywords
- (Xdelta3Version "3.0.0")
-)
-(Files
-  (xdelta3.wxs (xdelta3-tmp/0_xdelta3.wx 1.1 644))
-  (xdelta3.wxi (xdelta3-tmp/1_xdelta3.wx 1.1 644))
-  (xdelta3.vcproj (xdelta3-tmp/2_xdelta3.vc 1.1 644))
-  (xdelta3.swig (xdelta3-tmp/3_xdelta3.sw 1.1 644))
-  (xdelta3.h (xdelta3-tmp/4_xdelta3.h 1.1 644))
-  (xdelta3.c (xdelta3-tmp/5_xdelta3.c 1.1 644))
-  (xdelta3.1 (xdelta3-tmp/6_xdelta3.1 1.1 600))
-  (xdelta3-test.py (xdelta3-tmp/7_xdelta3-te 1.1 755))
-  (xdelta3-test.h (xdelta3-tmp/8_xdelta3-te 1.1 644))
-  (xdelta3-second.h (xdelta3-tmp/9_xdelta3-se 1.1 644))
-  (xdelta3-python.h (xdelta3-tmp/10_xdelta3-py 1.1 644))
-  (xdelta3-merge.h (xdelta3-tmp/12_xdelta3-me 1.1 644))
-  (xdelta3-main.h (xdelta3-tmp/13_xdelta3-ma 1.1 644))
-  (xdelta3-list.h (xdelta3-tmp/14_xdelta3-li 1.1 644))
-  (xdelta3-hash.h (xdelta3-tmp/15_xdelta3-ha 1.1 644))
-  (xdelta3-fgk.h (xdelta3-tmp/16_xdelta3-fg 1.1 644))
-  (xdelta3-djw.h (xdelta3-tmp/17_xdelta3-dj 1.1 644))
-  (xdelta3-decode.h (xdelta3-tmp/18_xdelta3-de 1.1 644))
-  (xdelta3-cfgs.h (xdelta3-tmp/19_xdelta3-cf 1.1 644))
-  (xdelta3-blkcache.h (xdelta3-tmp/20_xdelta3-bl 1.1 644))
-  (testing/xdelta3-regtest.py (xdelta3-tmp/21_xdelta3-re 1.1 755))
-  (testing/test.h (xdelta3-tmp/22_test.h 1.1 644))
-  (testing/sizes.h (xdelta3-tmp/23_sizes.h 1.1 644))
-  (testing/segment.h (xdelta3-tmp/24_segment.h 1.1 644))
-  (testing/regtest.cc (xdelta3-tmp/25_regtest.cc 1.1 644))
-  (testing/random.h (xdelta3-tmp/26_random.h 1.1 644))
-  (testing/modify.h (xdelta3-tmp/27_modify.h 1.1 644))
-  (testing/Makefile (xdelta3-tmp/28_Makefile 1.1 755))
-  (testing/file.h (xdelta3-tmp/29_file.h 1.1 644))
-  (testing/delta.h (xdelta3-tmp/30_delta.h 1.1 644))
-  (testing/dead.cc (xdelta3-tmp/31_dead.cc 1.1 644))
-  (testing/cmp.h (xdelta3-tmp/32_cmp.h 1.1 644))
-  (setup.py (xdelta3-tmp/33_setup.py 1.1 644))
-  (run.sh (xdelta3-tmp/34_run.sh 1.1 644))
-  (readme.txt (xdelta3-tmp/35_readme.txt 1.1 644))
-  (README (xdelta3-tmp/36_README 1.1 644))
-  (rcs_junk.cc (xdelta3-tmp/37_rcs_junk.c 1.1 644))
-  (plot.sh (xdelta3-tmp/38_plot.sh 1.1 644))
-  (Makefile.mingw (xdelta3-tmp/39_Makefile.m 1.1 644))
-  (Makefile (xdelta3-tmp/40_Makefile 1.1 644))
-  (linkxd3lib.c (xdelta3-tmp/41_linkxd3lib 1.1 644))
-  (examples/test.h (xdelta3-tmp/42_test.h 1.1 644))
-  (examples/speed_test.c (xdelta3-tmp/43_speed_test 1.1 644))
-  (examples/small_page_test.c (xdelta3-tmp/44_small_page 1.1 755))
-  (examples/README (xdelta3-tmp/45_README 1.1 644))
-  (examples/Makefile (xdelta3-tmp/46_Makefile 1.1 755))
-  (examples/encode_decode_test.c (xdelta3-tmp/47_encode_dec 1.1 644))
-  (examples/decoded.testdata (xdelta3-tmp/48_decoded.te 1.1 644))
-  (examples/compare_test.c (xdelta3-tmp/49_compare_te 1.1 644))
-  (examples/checksum_test.cc (xdelta3-tmp/50_checksum_t 1.1 644))
-  (draft-korn-vcdiff.txt (xdelta3-tmp/51_draft-korn 1.1 644))
-  (dead.code (xdelta3-tmp/b/0_dead.code 1.1 644))
-  (COPYING (xdelta3-tmp/b/1_COPYING 1.1 644))
-  (badcopy.vcproj (xdelta3-tmp/b/2_badcopy.vc 1.1 644))
-  (badcopy.c (xdelta3-tmp/b/3_badcopy.c 1.1 644))
-)
-(Merge-Parents)
-(New-Merge-Parents)
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 0242c57..20c7f9b 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -329,14 +329,14 @@
 
 typedef enum {
   VCD_DJW_ID    = 1,
-  VCD_FGK_ID    = 16, /* Note: these are not standard IANA-allocated IDs! */
+  VCD_FGK_ID    = 16  /* Note: these are not standard IANA-allocated IDs! */
 } xd3_secondary_ids;
 
 typedef enum {
   SEC_NOFLAGS     = 0,
 
   /* Note: SEC_COUNT_FREQS Not implemented (to eliminate 1st Huffman pass) */
-  SEC_COUNT_FREQS = (1 << 0),
+  SEC_COUNT_FREQS = (1 << 0)
 } xd3_secondary_flags;
 
 typedef enum {
@@ -344,7 +344,7 @@ typedef enum {
                  * compressor. */
   INST_SECTION, /* The header section is not compressed, therefore not
                  * listed here. */
-  ADDR_SECTION,
+  ADDR_SECTION
 } xd3_section_type;
 
 typedef unsigned int xd3_rtype;
@@ -782,6 +782,44 @@ const xd3_sec_type djw_sec_type =
 #endif /* __XDELTA3_C_HEADER_PASS__ */
 #ifdef __XDELTA3_C_INLINE_PASS__
 
+const uint16_t __single_hash[256] =
+{
+  /* Random numbers generated using SLIB's pseudo-random number generator.
+   * This hashes the input alphabet. */
+  0xbcd1, 0xbb65, 0x42c2, 0xdffe, 0x9666, 0x431b, 0x8504, 0xeb46,
+  0x6379, 0xd460, 0xcf14, 0x53cf, 0xdb51, 0xdb08, 0x12c8, 0xf602,
+  0xe766, 0x2394, 0x250d, 0xdcbb, 0xa678, 0x02af, 0xa5c6, 0x7ea6,
+  0xb645, 0xcb4d, 0xc44b, 0xe5dc, 0x9fe6, 0x5b5c, 0x35f5, 0x701a,
+  0x220f, 0x6c38, 0x1a56, 0x4ca3, 0xffc6, 0xb152, 0x8d61, 0x7a58,
+  0x9025, 0x8b3d, 0xbf0f, 0x95a3, 0xe5f4, 0xc127, 0x3bed, 0x320b,
+  0xb7f3, 0x6054, 0x333c, 0xd383, 0x8154, 0x5242, 0x4e0d, 0x0a94,
+  0x7028, 0x8689, 0x3a22, 0x0980, 0x1847, 0xb0f1, 0x9b5c, 0x4176,
+  0xb858, 0xd542, 0x1f6c, 0x2497, 0x6a5a, 0x9fa9, 0x8c5a, 0x7743,
+  0xa8a9, 0x9a02, 0x4918, 0x438c, 0xc388, 0x9e2b, 0x4cad, 0x01b6,
+  0xab19, 0xf777, 0x365f, 0x1eb2, 0x091e, 0x7bf8, 0x7a8e, 0x5227,
+  0xeab1, 0x2074, 0x4523, 0xe781, 0x01a3, 0x163d, 0x3b2e, 0x287d,
+  0x5e7f, 0xa063, 0xb134, 0x8fae, 0x5e8e, 0xb7b7, 0x4548, 0x1f5a,
+  0xfa56, 0x7a24, 0x900f, 0x42dc, 0xcc69, 0x02a0, 0x0b22, 0xdb31,
+  0x71fe, 0x0c7d, 0x1732, 0x1159, 0xcb09, 0xe1d2, 0x1351, 0x52e9,
+  0xf536, 0x5a4f, 0xc316, 0x6bf9, 0x8994, 0xb774, 0x5f3e, 0xf6d6,
+  0x3a61, 0xf82c, 0xcc22, 0x9d06, 0x299c, 0x09e5, 0x1eec, 0x514f,
+  0x8d53, 0xa650, 0x5c6e, 0xc577, 0x7958, 0x71ac, 0x8916, 0x9b4f,
+  0x2c09, 0x5211, 0xf6d8, 0xcaaa, 0xf7ef, 0x287f, 0x7a94, 0xab49,
+  0xfa2c, 0x7222, 0xe457, 0xd71a, 0x00c3, 0x1a76, 0xe98c, 0xc037,
+  0x8208, 0x5c2d, 0xdfda, 0xe5f5, 0x0b45, 0x15ce, 0x8a7e, 0xfcad,
+  0xaa2d, 0x4b5c, 0xd42e, 0xb251, 0x907e, 0x9a47, 0xc9a6, 0xd93f,
+  0x085e, 0x35ce, 0xa153, 0x7e7b, 0x9f0b, 0x25aa, 0x5d9f, 0xc04d,
+  0x8a0e, 0x2875, 0x4a1c, 0x295f, 0x1393, 0xf760, 0x9178, 0x0f5b,
+  0xfa7d, 0x83b4, 0x2082, 0x721d, 0x6462, 0x0368, 0x67e2, 0x8624,
+  0x194d, 0x22f6, 0x78fb, 0x6791, 0xb238, 0xb332, 0x7276, 0xf272,
+  0x47ec, 0x4504, 0xa961, 0x9fc8, 0x3fdc, 0xb413, 0x007a, 0x0806,
+  0x7458, 0x95c6, 0xccaa, 0x18d6, 0xe2ae, 0x1b06, 0xf3f6, 0x5050,
+  0xc8e8, 0xf4ac, 0xc04c, 0xf41c, 0x992f, 0xae44, 0x5f1b, 0x1113,
+  0x1738, 0xd9a8, 0x19ea, 0x2d33, 0x9698, 0x2fe9, 0x323f, 0xcde2,
+  0x6d71, 0xe37d, 0xb697, 0x2c4f, 0x4373, 0x9102, 0x075d, 0x8e25,
+  0x1672, 0xec28, 0x6acb, 0x86cc, 0x186e, 0x9414, 0xd674, 0xd1a5
+};
+
 /****************************************************************
  Instruction tables
  *****************************************************************/
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 39e0c17..b31cbe9 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -293,30 +293,12 @@ typedef int              (xd3_comp_table_func) (xd3_stream *stream,
 #define XD3_ASSERT(x) (void)0
 #endif  /* XD3_DEBUG */
 
-#ifdef __GNUC__
-#ifndef max
-#define max(x,y) ({ \
-        const typeof(x) _x = (x);       \
-        const typeof(y) _y = (y);       \
-        (void) (&_x == &_y);            \
-        _x > _y ? _x : _y; })
-#endif /* __GNUC__ */
-
-#ifndef min
-#define min(x,y) ({ \
-        const typeof(x) _x = (x);       \
-        const typeof(y) _y = (y);       \
-        (void) (&_x == &_y);            \
-        _x < _y ? _x : _y; })
-#endif
-#else  /* __GNUC__ */
 #ifndef max
 #define max(x,y) ((x) < (y) ? (y) : (x))
 #endif
 #ifndef min
 #define min(x,y) ((x) < (y) ? (x) : (y))
 #endif
-#endif  /* __GNUC__ */
 
 /****************************************************************
  PUBLIC ENUMS
@@ -351,7 +333,7 @@ typedef enum {
   XD3_INVALID_INPUT = -17712, /* invalid input/decoder error */
   XD3_NOSECOND    = -17713, /* when secondary compression finds no
                                improvement. */
-  XD3_UNIMPLEMENTED = -17714, /* currently VCD_TARGET */
+  XD3_UNIMPLEMENTED = -17714  /* currently VCD_TARGET */
 } xd3_rvalues;
 
 /* special values in config->flags */
@@ -408,7 +390,7 @@ typedef enum
   XD3_COMPLEVEL_2 = (2 << XD3_COMPLEVEL_SHIFT),
   XD3_COMPLEVEL_3 = (3 << XD3_COMPLEVEL_SHIFT),
   XD3_COMPLEVEL_6 = (6 << XD3_COMPLEVEL_SHIFT),
-  XD3_COMPLEVEL_9 = (9 << XD3_COMPLEVEL_SHIFT),
+  XD3_COMPLEVEL_9 = (9 << XD3_COMPLEVEL_SHIFT)
 
 } xd3_flags;
 
@@ -423,7 +405,7 @@ typedef enum
   XD3_SMATCH_FAST    = 2,
   XD3_SMATCH_FASTER  = 3,
   XD3_SMATCH_FASTEST = 4,
-  XD3_SMATCH_SOFT    = 5,
+  XD3_SMATCH_SOFT    = 5
 } xd3_smatch_cfg;
 
 /*********************************************************************
@@ -448,7 +430,7 @@ typedef enum {
                           source/target. */
   MATCH_FORWARD   = 2, /* currently expanding a match forward in the
                           source/target. */
-  MATCH_SEARCHING = 3, /* currently searching for a match. */
+  MATCH_SEARCHING = 3  /* currently searching for a match. */
 
 } xd3_match_state;
 
@@ -467,7 +449,7 @@ typedef enum {
   ENC_FLUSH     = 4, /* currently emitting output. */
   ENC_POSTOUT   = 5, /* after an output section. */
   ENC_POSTWIN   = 6, /* after all output sections. */
-  ENC_ABORTED   = 7, /* abort. */
+  ENC_ABORTED   = 7  /* abort. */
 } xd3_encode_state;
 
 /* The xd3_decode_input state machine steps through these states in
@@ -520,7 +502,7 @@ typedef enum {
 
   DEC_FINISH   = 23, /* window finished */
 
-  DEC_ABORTED  = 24, /* xd3_abort_stream */
+  DEC_ABORTED  = 24  /* xd3_abort_stream */
 } xd3_decode_state;
 
 /************************************************************
@@ -841,8 +823,7 @@ struct _xd3_stream
                                        * if there is at least one
                                        * match in the buffer. */
 
-  // SRCWIN
-  // these variables plus srcwin_maxsz above (set by config)
+  /* SRCWIN: these variables plus srcwin_maxsz above (set by config) */
   int                srcwin_decided;    /* boolean: true if srclen and
                                            srcbase have been
                                            decided. */
@@ -851,7 +832,7 @@ struct _xd3_stream
                                                decided early. */
   xoff_t             srcwin_cksum_pos;  /* Source checksum position */
 
-  // MATCH
+  /* MATCH */
   xd3_match_state    match_state;      /* encoder match state */
   xoff_t             match_srcpos;     /* current match source
                                           position relative to