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/log3gpp.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/log3gpp.c')
| -rw-r--r-- | wiretap/log3gpp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/log3gpp.c b/wiretap/log3gpp.c index d4f089ed37..ba526301ef 100644 --- a/wiretap/log3gpp.c +++ b/wiretap/log3gpp.c @@ -901,7 +901,7 @@ static const struct file_type_subtype_info log3gpp_info = { void register_log3gpp(void) { - log3gpp_file_type_subtype = wtap_register_file_type_subtypes(&log3gpp_info); + log3gpp_file_type_subtype = wtap_register_file_type_subtype(&log3gpp_info); /* * Register name for backwards compatibility with the @@ -923,7 +923,7 @@ void wtap_register_phonelog(void) { wtap_register_open_info(&phonelog_oi, TRUE); encap_3gpp_log = wtap_register_encap_type("3GPP Log","3gpp_log"); - wf_3gpp_log = wtap_register_file_type_subtypes(&fi, WTAP_FILE_TYPE_SUBTYPE_UNKNOWN); + wf_3gpp_log = wtap_register_file_type_subtype(&fi, WTAP_FILE_TYPE_SUBTYPE_UNKNOWN); } #endif |