diff options
author | Guy Harris <gharris@sonic.net> | 2021-02-23 19:10:35 -0800 |
---|---|---|
committer | Guy Harris <gharris@sonic.net> | 2021-02-23 20:39:16 -0800 |
commit | ed86f51e49e2b1ca64525bd14698528a50f3bbb4 (patch) | |
tree | 65f5a140a7b0c13265184c50a9c974b5de2f83a2 /wiretap/netxray.c | |
parent | 4cdc6ee5730ca32702d62b5959a3146ce9591596 (diff) |
wiretap: rename wtap_register_file_type_subtypes().
It only registers one file type/subtype, so rename it to
wtap_register_file_type_subtype().
That will also force plugins to be recompiled; that will produce compile
errors for some plugins that didn't change to match the new contents of
the file_type_subtype_info structure.
Also check to make sure that the registered file type/subtype supports
at least one type of block; a file type/subtype that doesn't return
*any* blocks and doesn't permit *any* block types to be written is not
very useful. That should also catch most if not all other plugins that
didn't change to match the new contents of the file_type_subtype_info
structure.
Don't make errors registering a file type/subtype fatal; just complain,
don't register the bogus file type/subtype, and drive on.
Diffstat (limited to 'wiretap/netxray.c')
-rw-r--r-- | wiretap/netxray.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 488e83a89c..0e778e3ef0 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -2149,10 +2149,10 @@ static const struct file_type_subtype_info netxray_2_00x_info = { void register_netxray(void) { - netxray_old_file_type_subtype = wtap_register_file_type_subtypes(&netxray_old_info); - netxray_1_0_file_type_subtype = wtap_register_file_type_subtypes(&netxray_1_0_info); - netxray_1_1_file_type_subtype = wtap_register_file_type_subtypes(&netxray_1_1_info); - netxray_2_00x_file_type_subtype = wtap_register_file_type_subtypes(&netxray_2_00x_info); + netxray_old_file_type_subtype = wtap_register_file_type_subtype(&netxray_old_info); + netxray_1_0_file_type_subtype = wtap_register_file_type_subtype(&netxray_1_0_info); + netxray_1_1_file_type_subtype = wtap_register_file_type_subtype(&netxray_1_1_info); + netxray_2_00x_file_type_subtype = wtap_register_file_type_subtype(&netxray_2_00x_info); /* * Register names for backwards compatibility with the |