Cleanup of previous. New xd3_merge_input_output used in both

main_merge_arguments and main_merge_output.

2 files changed, 41 insertions, 21 deletions

diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index acb0ac0..91c9884 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1692,22 +1692,13 @@ main_merge_arguments (main_merge_list* merges)
             }
           else
             {
-              xd3_stream tmp_stream;
-              memset (& tmp_stream, 0, sizeof (tmp_stream));
-              if ((ret = xd3_config_stream (& tmp_stream, NULL)) ||
-                  (ret = xd3_whole_state_init (& tmp_stream)) ||
-                  (ret = xd3_merge_inputs (& tmp_stream, 
-                                           & merge_input.whole_target,
-                                           & recode_stream->whole_target)))
-                {
-                  XPR(NT XD3_LIB_ERRMSG (&tmp_stream, ret));
-                }
+              /* Merge the recode_stream with merge_input. */
+              ret = xd3_merge_input_output (recode_stream,
+                                            & merge_input.whole_target);
 
-              /* the output is in tmp_stream.whole_state, swap into input */
-              xd3_swap_whole_state (& merge_input.whole_target,
-                                    & tmp_stream.whole_target);
-              /* total allocation counts are preserved */
-              xd3_free_stream (& tmp_stream);
+              /* Save the next merge source in merge_input. */
+              xd3_swap_whole_state (& recode_stream->whole_target,
+                                    & merge_input.whole_target);
             }
         }
 
@@ -1792,10 +1783,9 @@ main_merge_output (xd3_stream *stream, main_file *ofile)
 
   /* merge_stream is set if there were arguments.  this stream's input
    * needs to be applied to the merge_stream source. */
-  if (merge_stream != NULL &&
-      (ret = xd3_merge_inputs (stream, 
-                               & merge_stream->whole_target, 
-                               & stream->whole_target)))
+  if ((merge_stream != NULL) &&
+      (ret = xd3_merge_input_output (stream, 
+                                     & merge_stream->whole_target)))
     {
       XPR(NT XD3_LIB_ERRMSG (stream, ret));
       return ret;
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index 2e54cb5..a7b3329 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -19,6 +19,10 @@
 #ifndef _XDELTA3_MERGE_H_
 #define _XDELTA3_MERGE_H_
 
+int xd3_merge_inputs (xd3_stream *stream, 
+                      xd3_whole_state *source,
+                      xd3_whole_state *input);
+
 static int
 xd3_whole_state_init (xd3_stream *stream)
 {
@@ -190,13 +194,39 @@ xd3_whole_append_window (xd3_stream *stream)
   return 0;
 }
 
+/* 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)
+{
+  int ret;
+  xd3_stream tmp_stream;
+  memset (& tmp_stream, 0, sizeof (tmp_stream));
+  if ((ret = xd3_config_stream (& tmp_stream, NULL)) ||
+      (ret = xd3_whole_state_init (& tmp_stream)) ||
+      (ret = xd3_merge_inputs (& tmp_stream, 
+                               source,
+                               & stream->whole_target)))
+    {
+      XPR(NT XD3_LIB_ERRMSG (&tmp_stream, ret));
+      return ret;
+    }
+
+  /* the output is in tmp_stream.whole_state, swap into input */
+  xd3_swap_whole_state (& stream->whole_target,
+                        & tmp_stream.whole_target);
+  /* total allocation counts are preserved */
+  xd3_free_stream (& tmp_stream);
+  return 0;
+}
+
 /* xd3_merge_inputs() applies *input to *source, returns its result in
- * stream. */
+ * stream.  In certain cases, input == stream->whole_target. */
 int xd3_merge_inputs (xd3_stream *stream, 
                       xd3_whole_state *source,
                       xd3_whole_state *input)
 {
-  DP(RINT "Merge inputs!\n");
+
 
   xd3_swap_whole_state (&stream->whole_target, input);