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, 19 insertions, 1 deletions

diff --git a/wiretap/mp4.c b/wiretap/mp4.c
index 25a811e270..92d9e91914 100644
--- a/wiretap/mp4.c
+++ b/wiretap/mp4.c
@@ -16,6 +16,10 @@
 
 static const guint8 mp4_magic[] = { 'f', 't', 'y', 'p' };
 
+static int mp4_file_type_subtype = -1;
+
+void register_mp4(void);
+
 wtap_open_return_val
 mp4_open(wtap *wth, int *err, gchar **err_info)
 {
@@ -38,7 +42,7 @@ mp4_open(wtap *wth, int *err, gchar **err_info)
 	if (file_seek(wth->fh, 0, SEEK_SET, err) == -1)
 		return WTAP_OPEN_ERROR;
 
-	wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_MP4;
+	wth->file_type_subtype = mp4_file_type_subtype;
 	wth->file_encap = WTAP_ENCAP_MP4;
 	wth->file_tsprec = WTAP_TSPREC_SEC;
 	wth->subtype_read = wtap_full_file_read;
@@ -48,6 +52,20 @@ mp4_open(wtap *wth, int *err, gchar **err_info)
 	return WTAP_OPEN_MINE;
 }
 
+static const struct file_type_subtype_info mp4_info = {
+	/* WTAP_FILE_TYPE_SUBTYPE_MP4 */
+	"MP4 media", "mp4", "mp4", NULL,
+	FALSE, FALSE, 0,
+	NULL, NULL, NULL
+};
+
+void register_mp4(void)
+{
+	mp4_file_type_subtype =
+	    wtap_register_file_type_subtypes(&mp4_info,
+	        WTAP_FILE_TYPE_SUBTYPE_UNKNOWN);
+}
+
 /*
  * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
  *