aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/ber.c
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2021-02-23 19:10:35 -0800
committerGuy Harris <gharris@sonic.net>2021-02-23 20:39:16 -0800
commited86f51e49e2b1ca64525bd14698528a50f3bbb4 (patch)
tree65f5a140a7b0c13265184c50a9c974b5de2f83a2 /wiretap/ber.c
parent4cdc6ee5730ca32702d62b5959a3146ce9591596 (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/ber.c')
-rw-r--r--wiretap/ber.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/ber.c b/wiretap/ber.c
index c71ed65ca2..d9182c7532 100644
--- a/wiretap/ber.c
+++ b/wiretap/ber.c
@@ -146,7 +146,7 @@ static const struct file_type_subtype_info ber_info = {
void register_ber(void)
{
- ber_file_type_subtype = wtap_register_file_type_subtypes(&ber_info);
+ ber_file_type_subtype = wtap_register_file_type_subtype(&ber_info);
/*
* Register name for backwards compatibility with the