wiretap: register most built-in file types from its module.

Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().

This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler).  (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)

A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.

Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine.  In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.

Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.

While we're at it, add modelines to a file that lacked them.

1 files changed, 17 insertions, 1 deletions

diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index 227816e00d..fdcffb3752 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -265,6 +265,10 @@ static gboolean lanalyzer_seek_read(wtap *wth, gint64 seek_off,
 static gboolean lanalyzer_dump_finish(wtap_dumper *wdh, int *err,
     gchar **err_info);
 
+static int lanalyzer_file_type_subtype = -1;
+
+void register_lanalyzer(void);
+
 wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info)
 {
       LA_RecordHeader rec_header;
@@ -452,7 +456,7 @@ done:
       /* If we made it this far, then the file is a readable LANAlyzer file.
        * Let's get some info from it. Note that we get wth->snapshot_length
        * from a record later in the file. */
-      wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_LANALYZER;
+      wth->file_type_subtype = lanalyzer_file_type_subtype;
       lanalyzer = g_new(lanalyzer_t, 1);
       lanalyzer->start = start;
       wth->priv = (void *)lanalyzer;
@@ -960,6 +964,18 @@ static gboolean lanalyzer_dump_finish(wtap_dumper *wdh, int *err,
       return *err ? FALSE : TRUE;
 }
 
+static const struct file_type_subtype_info lanalyzer_info = {
+      "Novell LANalyzer","lanalyzer", "tr1", NULL,
+      TRUE, FALSE, 0,
+      lanalyzer_dump_can_write_encap, lanalyzer_dump_open, NULL
+};
+
+void register_lanalyzer(void)
+{
+      lanalyzer_file_type_subtype = wtap_register_file_type_subtypes(&lanalyzer_info,
+                                                                     WTAP_FILE_TYPE_SUBTYPE_UNKNOWN);
+}
+
 /*
  * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
  *