Remove some single-SHB assumptions.

Make wtap_file_get_shb() take a section number argument, and update code
that called it.  In most cases, we convert the code to iterate over
sections; in cases where a big code change would be required, we
temporarily pass it 0 and mark the code as "needs to be updated for
multiple sections".

Eliminate cf_read_section_comment(); in calls outside file.c, other code
directly calls the libwiretap routines it calls and, inside file.c, we
just transplant the code and then fix it not to assume a single SHB.

Change-Id: I85e94d0a4fc878e9d937088759be04cb004e019b
Reviewed-on: https://code.wireshark.org/review/37000
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>

1 files changed, 0 insertions, 9 deletions

diff --git a/file.h b/file.h
index 888c72556c..623fafb1fa 100644
--- a/file.h
+++ b/file.h
@@ -671,15 +671,6 @@ cf_merge_files_to_tempfile(gpointer pd_window, char **out_filenamep,
                            int in_file_count, const char *const *in_filenames,
                            int file_type, gboolean do_append);
 
-
-/**
- * Get the comment on a capture from the SHB data block
- * XXX - should support multiple sections.
- *
- * @param cf the capture file
- */
-const gchar* cf_read_section_comment(capture_file *cf);
-
 /**
  * Update(replace) the comment on a capture from the SHB data block
  * XXX - should support multiple sections.