Add mechanism for processing merge arguments in order, memory

management for xd3_whole_target structures being passed between
arguments-processing and main merge_output function.

1 files changed, 12 insertions, 6 deletions

diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 9b009f1..d77649f 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -248,6 +248,7 @@ typedef struct _xd3_config             xd3_config;
 typedef struct _xd3_code_table_desc    xd3_code_table_desc;
 typedef struct _xd3_code_table_sizes   xd3_code_table_sizes;
 typedef struct _xd3_slist              xd3_slist;
+typedef struct _xd3_whole_state        xd3_whole_state;
 
 /* The stream configuration has three callbacks functions, all of
  * which may be supplied with NULL values.  If config->getblk is
@@ -636,6 +637,16 @@ struct _xd3_slist
   usize_t     last_pos;
 };
 
+/* whole state for, e.g., merge */
+struct _xd3_whole_state {
+  usize_t addslen;
+  uint8_t *adds;
+  usize_t  adds_alloc;
+  usize_t instlen;
+  xd3_winst *inst;
+  usize_t  inst_alloc;
+};
+
 /********************************************************************
  public types
  *******************************************************************/
@@ -944,12 +955,7 @@ struct _xd3_stream
 
   /* state for reconstructing whole files (e.g., for merge), this only
    * supports loading USIZE_T_MAX instructions, adds, etc. */
-  usize_t whole_target_addslen;
-  uint8_t *whole_target_adds;
-  usize_t  whole_target_adds_alloc;
-  usize_t whole_target_instlen;
-  xd3_winst *whole_target_inst;
-  usize_t  whole_target_inst_alloc;
+  xd3_whole_state     whole_target;
 
   /* statistics */
   xoff_t            n_scpy;