Change _completely() to _completely_stream(), to introduce a new,

simpler in-memory API.

6 files changed, 65 insertions, 63 deletions

diff --git a/xdelta3/linkxd3lib.c b/xdelta3/linkxd3lib.c
index d605fa6..feed876 100755
--- a/xdelta3/linkxd3lib.c
+++ b/xdelta3/linkxd3lib.c
@@ -27,7 +27,7 @@ int main() {
   use (xd3_set_source (& stream, & source));
   xd3_set_flags (& stream, 0);
   
-  use (xd3_decode_completely (& stream, NULL, 0, NULL, NULL, 0));
+  use (xd3_decode_completely_stream (& stream, NULL, 0, NULL, NULL, 0));
   use (xd3_decode_input (&stream));
   use (xd3_decoder_needs_source (& stream));
   use (xd3_get_appheader (& stream, NULL, NULL));
@@ -37,7 +37,7 @@ int main() {
                              
 #if XD3_ENCODER
   use (xd3_encode_input (&stream));
-  use (xd3_encode_completely (& stream, NULL, 0, NULL, NULL, 0));
+  use (xd3_encode_completely_stream (& stream, NULL, 0, NULL, NULL, 0));
   use (xd3_set_appheader (& stream));
   use (xd3_encoder_used_source (& stream));
   use (xd3_encoder_srcbase (& stream));
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index f49868f..b18e919 100755
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -257,7 +257,7 @@ static int         option_no_compress        = 0;
 static int         option_no_output          = 0; /* go through the motions, but do not open or write output */
 static const char *option_source_filename    = NULL;
 
-static int         option_iopt_size          = XD3_DEFAULT_IOPT_SIZE;
+static usize_t     option_iopt_size          = XD3_DEFAULT_IOPT_SIZE;
 static usize_t     option_winsize            = XD3_DEFAULT_WINSIZE;
 static usize_t     option_srcwinsz           = XD3_DEFAULT_SRCWINSZ;
 static int         option_srcwinsz_set       = 0;
@@ -303,7 +303,7 @@ static int allow_fake_source = 0;
  * the program knows the mapping of IDENT->NAME. */
 static main_extcomp extcomp_types[] =
 {
-  /* The entry for xdelta3/1 must be 0/1 because the program_names are set there. */
+  /* The entry for xdelta3 must be 0 because the program_name is set there. */
   { "xdelta3",  "-cfq",  "xdelta3",    "-dcfq",  "X", "\xd6\xc3\xc4", 3, RD_NONEXTERNAL },
   { "bzip2",    "-cf",   "bzip2",      "-dcf",   "B", "BZh",          3, 0 },
   { "gzip",     "-cf",   "gzip",       "-dcf",   "G", "\037\213",     2, 0 },
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 36166c6..2307b7e 100755
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -701,7 +701,7 @@ test_compress_text (xd3_stream  *stream,
 
   xd3_set_appheader (stream, test_apphead, sizeof (test_apphead));
 
-  if ((ret = xd3_encode_completely (stream, test_text, sizeof (test_text),
+  if ((ret = xd3_encode_completely_stream (stream, test_text, sizeof (test_text),
                                     encoded, encoded_size, 4*sizeof (test_text)))) { goto fail; }
 
   if ((ret = xd3_close_stream (stream))) { goto fail; }
@@ -1384,7 +1384,7 @@ test_streaming (xd3_stream *in_stream, uint8_t *encbuf, uint8_t *decbuf, uint8_t
 
       if ((i % 200) == 199) { DOT (); }
 
-      if ((ret = xd3_process_completely (& estream, xd3_encode_input, 0,
+      if ((ret = xd3_process_completely_stream (& estream, xd3_encode_input, 0,
                                          encbuf, 1 << 20,
                                          delbuf, & delsize, 1 << 10)))
         {
@@ -1392,7 +1392,7 @@ test_streaming (xd3_stream *in_stream, uint8_t *encbuf, uint8_t *decbuf, uint8_t
           goto fail;
         }
 
-      if ((ret = xd3_process_completely (& dstream, xd3_decode_input, 0,
+      if ((ret = xd3_process_completely_stream (& dstream, xd3_decode_input, 0,
                                          delbuf, delsize,
                                          decbuf, & decsize, 1 << 20)))
         {
@@ -1921,7 +1921,7 @@ test_identical_behavior (xd3_stream *stream, int ignore)
   if ((ret = xd3_set_source (stream, & source))) { goto fail; }
 
   /* Decode. */
-  if ((ret = xd3_decode_completely (stream, del, delpos, rec, & recsize, IDB_TGTSZ))) { goto fail; }
+  if ((ret = xd3_decode_completely_stream (stream, del, delpos, rec, & recsize, IDB_TGTSZ))) { goto fail; }
 
   /* Check result size and data. */
   if (recsize != IDB_TGTSZ) { stream->msg = "wrong size reconstruction"; goto fail; }
@@ -2135,7 +2135,7 @@ test_iopt_flush_instructions (xd3_stream *stream, int ignore)
       target[tpos++] = i;
     }
 
-  if ((ret = xd3_encode_completely (stream, target, tpos,
+  if ((ret = xd3_encode_completely_stream (stream, target, tpos,
                                     delta, & delta_size, sizeof (delta))))
     {
       return ret;
@@ -2144,7 +2144,7 @@ test_iopt_flush_instructions (xd3_stream *stream, int ignore)
   xd3_free_stream(stream);
   if ((ret = xd3_config_stream (stream, & config))) { return ret; }
 
-  if ((ret = xd3_decode_completely (stream, delta, delta_size,
+  if ((ret = xd3_decode_completely_stream (stream, delta, delta_size,
                                     recon, & recon_size, sizeof (recon))))
     {
       return ret;
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 87a06ab..e5c82d8 100755
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -1204,7 +1204,7 @@ int xd3_compute_code_table_encoding (xd3_stream *in_stream, const xd3_dinst *cod
 
   if ((ret = xd3_set_source (& stream, & source))) { goto fail; }
 
-  if ((ret = xd3_encode_completely (& stream, code_string, CODE_TABLE_STRING_SIZE,
+  if ((ret = xd3_encode_completely_stream (& stream, code_string, CODE_TABLE_STRING_SIZE,
                                     comp_string, comp_string_size, CODE_TABLE_VCDIFF_SIZE))) { goto fail; }
 
  fail:
@@ -1400,7 +1400,7 @@ xd3_apply_table_encoding (xd3_stream *in_stream, const uint8_t *data, usize_t si
 
   if ((ret = xd3_config_stream (& stream, NULL)) ||
       (ret = xd3_set_source (& stream, & source)) ||
-      (ret = xd3_decode_completely (& stream, data, size, code_string, & code_size, sizeof (code_string))))
+      (ret = xd3_decode_completely_stream (& stream, data, size, code_string, & code_size, sizeof (code_string))))
     {
       in_stream->msg = stream.msg;
       goto fail;
@@ -3807,7 +3807,7 @@ xd3_encode_input (xd3_stream *stream)
 /* This function invokes either encode or decode to and from in-memory arrays.  The output array
  * must be large enough to hold the output or else ENOSPC is returned. */
 static int
-xd3_process_completely (xd3_stream    *stream,
+xd3_process_completely_stream (xd3_stream    *stream,
                         int          (*func) (xd3_stream *),
                         int            close_stream,
                         const uint8_t *input,
@@ -3860,28 +3860,28 @@ xd3_process_completely (xd3_stream    *stream,
 }
 
 int
-xd3_decode_completely (xd3_stream    *stream,
+xd3_decode_completely_stream (xd3_stream    *stream,
                        const uint8_t *input,
                        usize_t         input_size,
                        uint8_t       *output,
                        usize_t        *output_size,
                        usize_t         avail_size)
 {
-  return xd3_process_completely (stream, & xd3_decode_input, 1,
+  return xd3_process_completely_stream (stream, & xd3_decode_input, 1,
                                  input, input_size,
                                  output, output_size, avail_size);
 }
 
 #if XD3_ENCODER
 int
-xd3_encode_completely (xd3_stream    *stream,
+xd3_encode_completely_stream (xd3_stream    *stream,
                        const uint8_t *input,
                        usize_t         input_size,
                        uint8_t       *output,
                        usize_t        *output_size,
                        usize_t         avail_size)
 {
-  return xd3_process_completely (stream, & xd3_encode_input, 1,
+  return xd3_process_completely_stream (stream, & xd3_encode_input, 1,
                                  input, input_size,
                                  output, output_size, avail_size);
 }
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index c2fe0a6..86a2662 100755
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -841,9 +841,10 @@ struct _xd3_stream
  *   XD3_GETSRCBLK: If the xd3_getblk() callback is NULL, this value is returned to
  *               initiate a non-blocking source read.
  *
- * For simple usage, see the xd3_process_completely() function, which underlies
- * xd3_encode_completely() and xd3_decode_completely() [xdelta3.c].  For real application
- * usage, including the application header, the see command-line utility [xdelta3-main.h].
+ * For simple usage, see the xd3_process_completely_stream() function, which underlies
+ * xd3_encode_completely_stream() and xd3_decode_completely_stream() [xdelta3.c].  For
+ * real application usage, including the application header, the see command-line utility
+ * [xdelta3-main.h].
  *
  * main_input() implements the command-line encode and decode as well as the optional
  * VCDIFF_TOOLS printhdr, printhdrs, and printdelta with a single loop [xdelta3-main.h].
@@ -881,21 +882,21 @@ int     xd3_set_source    (xd3_stream    *stream,
 
 /* This function invokes xd3_encode_input using whole-file, in-memory inputs.  The output
  * array must be large enough to hold the output or else ENOSPC is returned. */
-int     xd3_encode_completely (xd3_stream    *stream,
-                               const uint8_t *input,
-                               usize_t         input_size,
-                               uint8_t       *output,
-                               usize_t        *output_size,
-                               usize_t         avail_output);
+int     xd3_encode_completely_stream (xd3_stream    *stream,
+                                      const uint8_t *input,
+                                      usize_t         input_size,
+                                      uint8_t       *output,
+                                      usize_t        *output_size,
+                                      usize_t         avail_output);
 
 /* This function invokes xd3_decode_input using whole-file, in-memory inputs.  The output
  * array must be large enough to hold the output or else ENOSPC is returned. */
-int     xd3_decode_completely (xd3_stream    *stream,
-                               const uint8_t *input,
-                               usize_t         input_size,
-                               uint8_t       *output,
-                               usize_t        *output_size,
-                               usize_t         avail_size);
+int     xd3_decode_completely_stream (xd3_stream    *stream,
+                                      const uint8_t *input,
+                                      usize_t         input_size,
+                                      uint8_t       *output,
+                                      usize_t        *output_size,
+                                      usize_t         avail_size);
 
 /* This should be called before the first call to xd3_encode_input() to include
  * application-specific data in the VCDIFF header. */
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
index 8217daa..ae05516 100755
--- a/xdelta3/xdelta3.prj
+++ b/xdelta3/xdelta3.prj
@@ -1,11 +1,12 @@
 ;; -*- Prcs -*-
-(Created-By-Prcs-Version 1 3 3)
+(Created-By-Prcs-Version 1 3 4)
 (Project-Description "")
-(Project-Version xdelta3 0 5)
-(Parent-Version xdelta3 0 4)
-(Version-Log "write a bit of documentation, work to fix/clean the regression test, fixed one actual bug in xd3_stream_close()")
-(New-Version-Log "update .prj after 2 years! see http://code.google.com/p/xdelta/")
-(Checkin-Time "Sun, 30 May 2004 14:42:47 -0700")
+(Project-Version xdelta3 0 9)
+(Parent-Version xdelta3 0 8)
+(Version-Log "rename encode/decode_completely to encode/decode_completely_stream
+")
+(New-Version-Log "")
+(Checkin-Time "Sun, 28 Jan 2007 21:08:28 -0800")
 (Checkin-Login jmacd)
 (Populate-Ignore ())
 (Project-Keywords
@@ -13,37 +14,37 @@
  (WWWLeftNavBar "<table cellpadding=\"20px\" width=700> <tr> <td class=\"leftbdr\" valign=top height=600 width=100> <div class=\"leftbody\"> <h1>Xdelta</h1> <a href=\"xdelta3.html\">overview</a><br> <a href=\"xdelta3-cmdline.html\">command&nbsp;line</a><br> <a href=\"xdelta3-api-guide.html\">api&nbsp;guide</a><br> <br><a href=\"http://xdelta.org\">xdelta.org</a></h2> </div> </td> <td valign=top width=500>")
  )
 (Files
-  (COPYING ())
+  (COPYING (xdelta3/b/29_COPYING 1.1 644))
 
-  (xdelta3-cfgs.h (xdelta3/9_xdelta3-cf 1.1 644))
-  (xdelta3-decode.h ())
-  (xdelta3-djw.h (xdelta3/8_xdelta3-dj 1.1 644))
-  (xdelta3-fgk.h (xdelta3/7_xdelta3-fg 1.1 644))
-  (xdelta3-list.h (xdelta3/6_xdelta3-li 1.1 644))
-  (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.3 644))
-  (xdelta3-python.h (xdelta3/4_xdelta3-py 1.1 644))
-  (xdelta3-regtest.py (xdelta3/10_xdelta3-re 1.3 755))
-  (xdelta3-second.h (xdelta3/3_xdelta3-se 1.1 644))
-  (xdelta3-test.h (xdelta3/2_xdelta3-te 1.2 644))
-  (xdelta3.c (xdelta3/16_xdelta3.c 1.3 644))
-  (xdelta3.h (xdelta3/1_xdelta3.h 1.2 644))
+  (xdelta3-cfgs.h (xdelta3/9_xdelta3-cf 1.2 744))
+  (xdelta3-decode.h (xdelta3/b/30_xdelta3-de 1.1 744))
+  (xdelta3-djw.h (xdelta3/8_xdelta3-dj 1.2 744))
+  (xdelta3-fgk.h (xdelta3/7_xdelta3-fg 1.2 744))
+  (xdelta3-list.h (xdelta3/6_xdelta3-li 1.2 644))
+  (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.5 744))
+  (xdelta3-python.h (xdelta3/4_xdelta3-py 1.2 644))
+  (xdelta3-regtest.py (xdelta3/10_xdelta3-re 1.4 744))
+  (xdelta3-second.h (xdelta3/3_xdelta3-se 1.2 744))
+  (xdelta3-test.h (xdelta3/2_xdelta3-te 1.4 744))
+  (xdelta3.c (xdelta3/16_xdelta3.c 1.5 744))
+  (xdelta3.h (xdelta3/1_xdelta3.h 1.4 744))
 
-  (Makefile (xdelta3/0_Makefile 1.3 644))
-  (setup.py (xdelta3/11_setup.py 1.1 644))
+  (Makefile (xdelta3/0_Makefile 1.4 744))
+  (setup.py (xdelta3/11_setup.py 1.2 744))
 
-  (draft-korn-vcdiff.txt (xdelta3/b/22_draft-korn 1.1 600))
-  (www/xdelta3-api-guide.html (xdelta3/b/23_Xdelta3-ap 1.4 644))
-  (www/xdelta3-cmdline.html (xdelta3/b/25_xdelta3-cm 1.2 644))
-  (www/xdelta3.css (xdelta3/b/26_xdelta3.cs 1.3 644))
-  (www/xdelta3.html (xdelta3/b/24_Xdelta3.ht 1.4 644))
+  (draft-korn-vcdiff.txt (xdelta3/b/22_draft-korn 1.1 644))
+  (www/xdelta3-api-guide.html (xdelta3/b/23_Xdelta3-ap 1.5 744))
+  (www/xdelta3-cmdline.html (xdelta3/b/25_xdelta3-cm 1.3 744))
+  (www/xdelta3.css (xdelta3/b/26_xdelta3.cs 1.3 744))
+  (www/xdelta3.html (xdelta3/b/24_Xdelta3.ht 1.5 744))
 
-  (badcopy.c (xdelta3/20_badcopy.c 1.1 644))
-  (linkxd3lib.c (xdelta3/19_linkxd3lib 1.1 644))
+  (badcopy.c (xdelta3/20_badcopy.c 1.2 744))
+  (linkxd3lib.c (xdelta3/19_linkxd3lib 1.2 744))
   (rcs_junk.cc (xdelta3/15_rcs_junk.c 1.1 644))
 
-  (README ())
-  (badcopy.vcproj ())
-  (xdelta3.vcproj ())
+  (README (xdelta3/b/31_README 1.1 744))
+  (badcopy.vcproj (xdelta3/b/32_badcopy.vc 1.1 744))
+  (xdelta3.vcproj (xdelta3/b/33_xdelta3.vc 1.1 744))
 )
 (Merge-Parents)
 (New-Merge-Parents)