Make routines used only within wiretap/merge.c static.

We just export some UI helpers and the Big Merge Engine.

Change-Id: I60bc8ab167e7100189a9ce60d84c0e4db27b6bda
Reviewed-on: https://code.wireshark.org/review/11689
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/debian/libwiretap0.symbols b/debian/libwiretap0.symbols
index 7d8d6c053e03b75a78f3a7304701090e783d01fe..2b7bbf796a6a096a09eff62c4c6b693a38e613e5 100644 (file)
--- a/debian/libwiretap0.symbols
+++ b/debian/libwiretap0.symbols
@@ -9,14 +9,8 @@ libwiretap.so.0 libwiretap0 #MINVER#
  file_seek@Base 1.9.1
  file_tell@Base 1.9.1
  init_open_routines@Base 1.12.0~rc1
- merge_append_read_packet@Base 1.12.0~rc1
- merge_close_in_files@Base 1.12.0~rc1
  merge_files@Base 1.99.9
  merge_idb_merge_mode_to_string@Base 1.99.9
- merge_max_snapshot_length@Base 1.12.0~rc1
- merge_open_in_files@Base 1.12.0~rc1
- merge_read_packet@Base 1.12.0~rc1
- merge_select_frame_type@Base 1.12.0~rc1
  merge_string_to_idb_merge_mode@Base 1.99.9
  open_info_name_to_type@Base 1.12.0~rc1
  open_routines@Base 1.12.0~rc1

diff --git a/wiretap/merge.c b/wiretap/merge.c
index 1d3bebc609d9571cac1f5c7613775ed420745c14..56dc5bfc4bd63b749d706a26c81f89019743a00f 100644 (file)
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -108,10 +108,17 @@ add_idb_index_map(merge_in_file_t *in_file, const guint orig_index, const guint
     g_array_append_val(in_file->idb_index_map, found_index);
 }
 
-/*
- * Scan through the arguments and open the input files
+/** Open a number of input files to merge.
+ *
+ * @param in_file_count number of entries in in_file_names and in_files
+ * @param in_file_names filenames of the input files
+ * @param in_files input file array to be filled (>= sizeof(merge_in_file_t) * in_file_count)
+ * @param err wiretap error, if failed
+ * @param err_info wiretap error string, if failed
+ * @param err_fileno file on which open failed, if failed
+ * @return TRUE if all files could be opened, FALSE otherwise
  */
-gboolean
+static gboolean
 merge_open_in_files(int in_file_count, const char *const *in_file_names,
                     merge_in_file_t **in_files, int *err, gchar **err_info,
                     int *err_fileno)
@@ -152,10 +159,12 @@ merge_open_in_files(int in_file_count, const char *const *in_file_names,
     return TRUE;
 }
 
-/*
- * Scan through and close each input file
+/** Close the input files again.
+ *
+ * @param in_file_count number of entries in in_files
+ * @param in_files input file array to be closed
  */
-void
+static void
 merge_close_in_files(int count, merge_in_file_t in_files[])
 {
     int i;
@@ -164,15 +173,19 @@ merge_close_in_files(int count, merge_in_file_t in_files[])
     }
 }
 
-/*
- * Select an output frame type based on the input files
- * From Guy: If all files have the same frame type, then use that.
- *           Otherwise select WTAP_ENCAP_PER_PACKET.  If the selected
- *           output file type doesn't support per packet frame types,
- *           then the wtap_dump_open call will fail with a reasonable
- *           error condition.
+/** Select an output frame type based on the input files
+ *
+ * If all files have the same frame type, then use that.
+ * Otherwise select WTAP_ENCAP_PER_PACKET.  If the selected
+ * output file type doesn't support per packet frame types,
+ * then the wtap_dump_open call will fail with a reasonable
+ * error condition.
+ *
+ * @param in_file_count number of entries in in_files
+ * @param in_files input file array
+ * @return the frame type
  */
-int
+static int
 merge_select_frame_type(int count, merge_in_file_t files[])
 {
     int i;
@@ -191,28 +204,6 @@ merge_select_frame_type(int count, merge_in_file_t files[])
     return selected_frame_type;
 }
 
-/*
- * Scan through input files and find maximum snapshot length
- */
-int
-merge_max_snapshot_length(int count, merge_in_file_t in_files[])
-{
-    int i;
-    int max_snapshot = 0;
-    int snapshot_length;
-
-    for (i = 0; i < count; i++) {
-        snapshot_length = wtap_snapshot_length(in_files[i].wth);
-        if (snapshot_length == 0) {
-            /* Snapshot length of input file not known. */
-            snapshot_length = WTAP_MAX_PACKET_SIZE;
-        }
-        if (snapshot_length > max_snapshot)
-            max_snapshot = snapshot_length;
-    }
-    return max_snapshot;
-}
-
 /*
  * returns TRUE if first argument is earlier than second
  */
@@ -232,9 +223,8 @@ is_earlier(nstime_t *l, nstime_t *r) /* XXX, move to nstime.c */
     return TRUE;
 }
 
-/*
- * Read the next packet, in chronological order, from the set of files
- * to be merged.
+/** Read the next packet, in chronological order, from the set of files to
+ * be merged.
  *
  * On success, set *err to 0 and return a pointer to the merge_in_file_t
  * for the file from which the packet was read.
@@ -244,8 +234,15 @@ is_earlier(nstime_t *l, nstime_t *r) /* XXX, move to nstime.c */
  *
  * On an EOF (meaning all the files are at EOF), set *err to 0 and return
  * NULL.
+ *
+ * @param in_file_count number of entries in in_files
+ * @param in_files input file array
+ * @param err wiretap error, if failed
+ * @param err_info wiretap error string, if failed
+ * @return pointer to merge_in_file_t for file from which that packet
+ * came, or NULL on error or EOF
  */
-merge_in_file_t *
+static merge_in_file_t *
 merge_read_packet(int in_file_count, merge_in_file_t in_files[],
                   int *err, gchar **err_info)
 {
@@ -304,8 +301,7 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[],
     return &in_files[ei];
 }
 
-/*
- * Read the next packet, in file sequence order, from the set of files
+/** Read the next packet, in file sequence order, from the set of files
  * to be merged.
  *
  * On success, set *err to 0 and return a pointer to the merge_in_file_t
@@ -316,8 +312,15 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[],
  *
  * On an EOF (meaning all the files are at EOF), set *err to 0 and return
  * NULL.
+ *
+ * @param in_file_count number of entries in in_files
+ * @param in_files input file array
+ * @param err wiretap error, if failed
+ * @param err_info wiretap error string, if failed
+ * @return pointer to merge_in_file_t for file from which that packet
+ * came, or NULL on error or EOF
  */
-merge_in_file_t *
+static merge_in_file_t *
 merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
                          int *err, gchar **err_info)
 {

diff --git a/wiretap/merge.h b/wiretap/merge.h
index 69162191bbabbc3734aa67a2d3c4a741f6bbf7e6..9c36dc4fc7276ac0d0d423c498c49783a5654f0c 100644 (file)
--- a/wiretap/merge.h
+++ b/wiretap/merge.h
@@ -49,77 +49,6 @@ typedef struct merge_in_file_s {
     GArray         *idb_index_map;  /* used for mapping the old phdr interface_id values to new during merge */
 } merge_in_file_t;
 
-/** Open a number of input files to merge.
- *
- * @param in_file_count number of entries in in_file_names and in_files
- * @param in_file_names filenames of the input files
- * @param in_files input file array to be filled (>= sizeof(merge_in_file_t) * in_file_count)
- * @param err wiretap error, if failed
- * @param err_info wiretap error string, if failed
- * @param err_fileno file on which open failed, if failed
- * @return TRUE if all files could be opened, FALSE otherwise
- */
-WS_DLL_PUBLIC gboolean
-merge_open_in_files(int in_file_count, const char *const *in_file_names,
-                    merge_in_file_t **in_files, int *err, gchar **err_info,
-                    int *err_fileno);
-
-/** Close the input files again.
- *
- * @param in_file_count number of entries in in_files
- * @param in_files input file array to be closed
- */
-WS_DLL_PUBLIC void
-merge_close_in_files(int in_file_count, merge_in_file_t in_files[]);
-
-/** Try to get the frame type from the input files.
- *
- * @param in_file_count number of entries in in_files
- * @param in_files input file array
- * @return the frame type
- */
-WS_DLL_PUBLIC int
-merge_select_frame_type(int in_file_count, merge_in_file_t in_files[]);
-
-/** Try to get the snapshot length from the input files.
- *
- * @param in_file_count number of entries in in_files
- * @param in_files input file array
- * @return the snapshot length
- */
-WS_DLL_PUBLIC int
-merge_max_snapshot_length(int in_file_count, merge_in_file_t in_files[]);
-
-/** Read the next packet, in chronological order, from the set of files to
- * be merged.
- *
- * @param in_file_count number of entries in in_files
- * @param in_files input file array
- * @param err wiretap error, if failed
- * @param err_info wiretap error string, if failed
- * @return pointer to merge_in_file_t for file from which that packet
- * came, or NULL on error or EOF
- */
-WS_DLL_PUBLIC merge_in_file_t *
-merge_read_packet(int in_file_count, merge_in_file_t in_files[], int *err,
-                  gchar **err_info);
-
-
-/** Read the next packet, in file sequence order, from the set of files
- * to be merged.
- *
- * @param in_file_count number of entries in in_files
- * @param in_files input file array
- * @param err wiretap error, if failed
- * @param err_info wiretap error string, if failed
- * @return pointer to merge_in_file_t for file from which that packet
- * came, or NULL on error or EOF
- */
-WS_DLL_PUBLIC merge_in_file_t *
-merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
-                         int *err, gchar **err_info);
-
-
 /** Return values from merge_files(). */
 typedef enum {
     MERGE_OK,