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>

1 files changed, 0 insertions, 71 deletions

diff --git a/wiretap/merge.h b/wiretap/merge.h
index 69162191bb..9c36dc4fc7 100644
--- 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,