Revert to r386; prepare 3.0.6 release

1 files changed, 7 insertions, 4 deletions

diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index b0bf370..af2336d 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -296,6 +296,9 @@ static main_extcomp extcomp_types[] =
   { "gzip",     "-c",   "gzip",       "-dc",   "G", "\037\213",     2, 0 },
   { "compress", "-c",   "uncompress", "-c",    "Z", "\037\235",     2, 0 },
 
+  /* TODO: add commandline support for magic-less formats */
+  /*{ "lzma", "-c",   "lzma", "-dc",   "M", "]\000", 2, 0 },*/
+
   /* Xz is lzma with a magic number http://tukaani.org/xz/ */
   { "xz", "-c", "xz", "-dc", "Y", "\xfd\x37\x7a\x58\x5a\x00", 2, 0 },
 };
@@ -357,7 +360,7 @@ static int
 main_version (void)
 {
   /* $Format: "  XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\\n\");" $ */
-  XPR(NTR "Xdelta version 3.0.5, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\n");
+  XPR(NTR "Xdelta version 3.0.6, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, Joshua MacDonald\n");
   XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
   XPR(NTR "This is free software, and you are welcome to redistribute it\n");
   XPR(NTR "under certain conditions; see \"COPYING\" for details.\n");
@@ -2415,7 +2418,7 @@ main_secondary_decompress_check (main_file  *file,
 {
   int ret;
   usize_t i;
-  size_t try_read = min (input_size, XD3_ALLOCSIZE);
+  usize_t try_read = min (input_size, XD3_ALLOCSIZE);
   size_t  check_nread = 0;
   uint8_t check_buf[XD3_ALLOCSIZE];  /* TODO: stack limit */
   const main_extcomp *decompressor = NULL;
@@ -3227,8 +3230,8 @@ main_input (xd3_cmd     cmd,
                 main_get_appheader (& stream, ifile, ofile, sfile);
 
                 /* Now open the source file. */
-                if ((sfile->filename != NULL) &&
-                    (ret = main_set_source (& stream, cmd, sfile, & source)))
+                  if ((sfile->filename != NULL) &&
+                      (ret = main_set_source (& stream, cmd, sfile, & source)))
                   {
                     return EXIT_FAILURE;
                   }