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/vwr.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/vwr.c')
| -rw-r--r-- | wiretap/vwr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/vwr.c b/wiretap/vwr.c index 953fac9a6a..768a4e6892 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -3398,8 +3398,8 @@ static const struct file_type_subtype_info vwr_eth_info = { void register_vwr(void) { - vwr_80211_file_type_subtype = wtap_register_file_type_subtypes(&vwr_80211_info); - vwr_eth_file_type_subtype = wtap_register_file_type_subtypes(&vwr_eth_info); + vwr_80211_file_type_subtype = wtap_register_file_type_subtype(&vwr_80211_info); + vwr_eth_file_type_subtype = wtap_register_file_type_subtype(&vwr_eth_info); /* * Register names for backwards compatibility with the |