forked from osmocom/wireshark
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.
This commit is contained in:
parent
4cdc6ee573
commit
ed86f51e49
|
@ -144,7 +144,7 @@ libwiretap.so.0 libwiretap0 #MINVER#
|
|||
wtap_register_backwards_compatibility_lua_name@Base 3.5.0
|
||||
wtap_register_encap_type@Base 1.9.1
|
||||
wtap_register_file_type_extension@Base 1.12.0~rc1
|
||||
wtap_register_file_type_subtypes@Base 1.12.0~rc1
|
||||
wtap_register_file_type_subtype@Base 3.5.0
|
||||
wtap_register_open_info@Base 1.12.0~rc1
|
||||
wtap_register_plugin@Base 2.5.0
|
||||
wtap_seek_read@Base 1.9.1
|
||||
|
|
|
@ -783,7 +783,7 @@ WSLUA_FUNCTION wslua_register_filehandler(lua_State* L) {
|
|||
fh->finfo.dump_open = wslua_filehandler_dump_open;
|
||||
}
|
||||
|
||||
fh->file_type = wtap_register_file_type_subtypes(&(fh->finfo));
|
||||
fh->file_type = wtap_register_file_type_subtype(&(fh->finfo));
|
||||
|
||||
if (fh->is_reader) {
|
||||
struct open_info oi = { NULL, OPEN_INFO_HEURISTIC, NULL, NULL, NULL, NULL };
|
||||
|
|
|
@ -337,7 +337,7 @@ wtap_register_usbdump(void)
|
|||
|
||||
wtap_register_open_info(&oi, FALSE);
|
||||
|
||||
usbdump_file_type_subtype = wtap_register_file_type_subtypes(&fi);
|
||||
usbdump_file_type_subtype = wtap_register_file_type_subtype(&fi);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -468,7 +468,7 @@ static const struct file_type_subtype_info _5views_info = {
|
|||
|
||||
void register_5views(void)
|
||||
{
|
||||
_5views_file_type_subtype = wtap_register_file_type_subtypes(&_5views_info);
|
||||
_5views_file_type_subtype = wtap_register_file_type_subtype(&_5views_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -356,7 +356,7 @@ static const struct file_type_subtype_info aethra_info = {
|
|||
|
||||
void register_aethra(void)
|
||||
{
|
||||
aethra_file_type_subtype = wtap_register_file_type_subtypes(&aethra_info);
|
||||
aethra_file_type_subtype = wtap_register_file_type_subtype(&aethra_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -472,7 +472,7 @@ static const struct file_type_subtype_info ascend_info = {
|
|||
|
||||
void register_ascend(void)
|
||||
{
|
||||
ascend_file_type_subtype = wtap_register_file_type_subtypes(&ascend_info);
|
||||
ascend_file_type_subtype = wtap_register_file_type_subtype(&ascend_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -441,7 +441,7 @@ static const struct file_type_subtype_info btsnoop_info = {
|
|||
|
||||
void register_btsnoop(void)
|
||||
{
|
||||
btsnoop_file_type_subtype = wtap_register_file_type_subtypes(&btsnoop_info);
|
||||
btsnoop_file_type_subtype = wtap_register_file_type_subtype(&btsnoop_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -457,7 +457,7 @@ static const struct file_type_subtype_info busmaster_info = {
|
|||
|
||||
void register_busmaster(void)
|
||||
{
|
||||
busmaster_file_type_subtype = wtap_register_file_type_subtypes(&busmaster_info);
|
||||
busmaster_file_type_subtype = wtap_register_file_type_subtype(&busmaster_info);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -467,7 +467,7 @@ static const struct file_type_subtype_info camins_info = {
|
|||
|
||||
void register_camins(void)
|
||||
{
|
||||
camins_file_type_subtype = wtap_register_file_type_subtypes(&camins_info);
|
||||
camins_file_type_subtype = wtap_register_file_type_subtype(&camins_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -244,7 +244,7 @@ static const struct file_type_subtype_info candump_info = {
|
|||
|
||||
void register_candump(void)
|
||||
{
|
||||
candump_file_type_subtype = wtap_register_file_type_subtypes(&candump_info);
|
||||
candump_file_type_subtype = wtap_register_file_type_subtype(&candump_info);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -462,8 +462,8 @@ static const struct file_type_subtype_info packet_builder_info = {
|
|||
|
||||
void register_capsa(void)
|
||||
{
|
||||
capsa_file_type_subtype = wtap_register_file_type_subtypes(&capsa_info);
|
||||
packet_builder_file_type_subtype = wtap_register_file_type_subtypes(&packet_builder_info);
|
||||
capsa_file_type_subtype = wtap_register_file_type_subtype(&capsa_info);
|
||||
packet_builder_file_type_subtype = wtap_register_file_type_subtype(&packet_builder_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -1666,7 +1666,7 @@ static const struct file_type_subtype_info dct2000_info = {
|
|||
|
||||
void register_dct2000(void)
|
||||
{
|
||||
dct2000_file_type_subtype = wtap_register_file_type_subtypes(&dct2000_info);
|
||||
dct2000_file_type_subtype = wtap_register_file_type_subtype(&dct2000_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -615,7 +615,7 @@ static const struct file_type_subtype_info commview_info = {
|
|||
|
||||
void register_commview(void)
|
||||
{
|
||||
commview_file_type_subtype = wtap_register_file_type_subtypes(&commview_info);
|
||||
commview_file_type_subtype = wtap_register_file_type_subtype(&commview_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -503,7 +503,7 @@ static const struct file_type_subtype_info cosine_info = {
|
|||
|
||||
void register_cosine(void)
|
||||
{
|
||||
cosine_file_type_subtype = wtap_register_file_type_subtypes(&cosine_info);
|
||||
cosine_file_type_subtype = wtap_register_file_type_subtype(&cosine_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -224,7 +224,7 @@ static const struct file_type_subtype_info csids_info = {
|
|||
|
||||
void register_csids(void)
|
||||
{
|
||||
csids_file_type_subtype = wtap_register_file_type_subtypes(&csids_info);
|
||||
csids_file_type_subtype = wtap_register_file_type_subtype(&csids_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -269,7 +269,7 @@ static const struct file_type_subtype_info daintree_sna_info = {
|
|||
|
||||
void register_daintree_sna(void)
|
||||
{
|
||||
daintree_sna_file_type_subtype = wtap_register_file_type_subtypes(&daintree_sna_info);
|
||||
daintree_sna_file_type_subtype = wtap_register_file_type_subtype(&daintree_sna_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -645,7 +645,7 @@ static const struct file_type_subtype_info dbs_etherwatch_info = {
|
|||
|
||||
void register_dbs_etherwatch(void)
|
||||
{
|
||||
dbs_etherwatch_file_type_subtype = wtap_register_file_type_subtypes(&dbs_etherwatch_info);
|
||||
dbs_etherwatch_file_type_subtype = wtap_register_file_type_subtype(&dbs_etherwatch_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -417,7 +417,7 @@ static const struct file_type_subtype_info dct3trace_info = {
|
|||
|
||||
void register_dct3trace(void)
|
||||
{
|
||||
dct3trace_file_type_subtype = wtap_register_file_type_subtypes(&dct3trace_info);
|
||||
dct3trace_file_type_subtype = wtap_register_file_type_subtype(&dct3trace_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -261,7 +261,7 @@ static const struct file_type_subtype_info dpa400_info = {
|
|||
|
||||
void register_dpa400(void)
|
||||
{
|
||||
dpa400_file_type_subtype = wtap_register_file_type_subtypes(&dpa400_info);
|
||||
dpa400_file_type_subtype = wtap_register_file_type_subtype(&dpa400_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -3451,7 +3451,7 @@ static const struct file_type_subtype_info erf_info = {
|
|||
|
||||
void register_erf(void)
|
||||
{
|
||||
erf_file_type_subtype = wtap_register_file_type_subtypes(&erf_info);
|
||||
erf_file_type_subtype = wtap_register_file_type_subtype(&erf_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -491,7 +491,7 @@ static const struct file_type_subtype_info eyesdn_info = {
|
|||
|
||||
void register_eyesdn(void)
|
||||
{
|
||||
eyesdn_file_type_subtype = wtap_register_file_type_subtypes(&eyesdn_info);
|
||||
eyesdn_file_type_subtype = wtap_register_file_type_subtype(&eyesdn_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -1314,7 +1314,7 @@ wtap_init_file_type_subtypes(void)
|
|||
* with that name is already registered.
|
||||
*/
|
||||
int
|
||||
wtap_register_file_type_subtypes(const struct file_type_subtype_info* fi)
|
||||
wtap_register_file_type_subtype(const struct file_type_subtype_info* fi)
|
||||
{
|
||||
struct file_type_subtype_info* finfo;
|
||||
guint file_type_subtype;
|
||||
|
@ -1323,7 +1323,16 @@ wtap_register_file_type_subtypes(const struct file_type_subtype_info* fi)
|
|||
* Check for required fields (description and name).
|
||||
*/
|
||||
if (!fi || !fi->description || !fi->name) {
|
||||
g_error("no file type info");
|
||||
g_warning("no file type info");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* There must be at least one block type that this file
|
||||
* type/subtype supports.
|
||||
*/
|
||||
if (fi->num_supported_blocks == 0 || fi->supported_blocks == NULL) {
|
||||
g_warning("no blocks supported by file type \"%s\"", fi->name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -1334,7 +1343,7 @@ wtap_register_file_type_subtypes(const struct file_type_subtype_info* fi)
|
|||
/*
|
||||
* Yes. You don't get to replace an existing handler.
|
||||
*/
|
||||
g_error("file type \"%s\" is already registered", fi->name);
|
||||
g_warning("file type \"%s\" is already registered", fi->name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ static const struct file_type_subtype_info hcidump_info = {
|
|||
|
||||
void register_hcidump(void)
|
||||
{
|
||||
hcidump_file_type_subtype = wtap_register_file_type_subtypes(&hcidump_info);
|
||||
hcidump_file_type_subtype = wtap_register_file_type_subtype(&hcidump_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -312,7 +312,7 @@ static const struct file_type_subtype_info i4btrace_info = {
|
|||
|
||||
void register_i4btrace(void)
|
||||
{
|
||||
i4btrace_file_type_subtype = wtap_register_file_type_subtypes(&i4btrace_info);
|
||||
i4btrace_file_type_subtype = wtap_register_file_type_subtype(&i4btrace_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -343,7 +343,7 @@ static const struct file_type_subtype_info ipfix_info = {
|
|||
|
||||
void register_ipfix(void)
|
||||
{
|
||||
ipfix_file_type_subtype = wtap_register_file_type_subtypes(&ipfix_info);
|
||||
ipfix_file_type_subtype = wtap_register_file_type_subtype(&ipfix_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -881,8 +881,8 @@ static const struct file_type_subtype_info iptrace_2_0_info = {
|
|||
|
||||
void register_iptrace(void)
|
||||
{
|
||||
iptrace_1_0_file_type_subtype = wtap_register_file_type_subtypes(&iptrace_1_0_info);
|
||||
iptrace_2_0_file_type_subtype = wtap_register_file_type_subtypes(&iptrace_2_0_info);
|
||||
iptrace_1_0_file_type_subtype = wtap_register_file_type_subtype(&iptrace_1_0_info);
|
||||
iptrace_2_0_file_type_subtype = wtap_register_file_type_subtype(&iptrace_2_0_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -1080,8 +1080,8 @@ static const struct file_type_subtype_info iseries_unicode_info = {
|
|||
|
||||
void register_iseries(void)
|
||||
{
|
||||
iseries_file_type_subtype = wtap_register_file_type_subtypes(&iseries_info);
|
||||
iseries_unicode_file_type_subtype = wtap_register_file_type_subtypes(&iseries_unicode_info);
|
||||
iseries_file_type_subtype = wtap_register_file_type_subtype(&iseries_info);
|
||||
iseries_unicode_file_type_subtype = wtap_register_file_type_subtype(&iseries_unicode_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -84,7 +84,7 @@ static const struct file_type_subtype_info json_info = {
|
|||
|
||||
void register_json(void)
|
||||
{
|
||||
json_file_type_subtype = wtap_register_file_type_subtypes(&json_info);
|
||||
json_file_type_subtype = wtap_register_file_type_subtype(&json_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -1408,7 +1408,7 @@ static const struct file_type_subtype_info k12_info = {
|
|||
|
||||
void register_k12(void)
|
||||
{
|
||||
k12_file_type_subtype = wtap_register_file_type_subtypes(&k12_info);
|
||||
k12_file_type_subtype = wtap_register_file_type_subtype(&k12_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -591,7 +591,7 @@ static const struct file_type_subtype_info k12text_info = {
|
|||
|
||||
void register_k12text(void)
|
||||
{
|
||||
k12text_file_type_subtype = wtap_register_file_type_subtypes(&k12text_info);
|
||||
k12text_file_type_subtype = wtap_register_file_type_subtype(&k12text_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -979,7 +979,7 @@ static const struct file_type_subtype_info lanalyzer_info = {
|
|||
|
||||
void register_lanalyzer(void)
|
||||
{
|
||||
lanalyzer_file_type_subtype = wtap_register_file_type_subtypes(&lanalyzer_info);
|
||||
lanalyzer_file_type_subtype = wtap_register_file_type_subtype(&lanalyzer_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -1405,13 +1405,13 @@ static const struct file_type_subtype_info pcap_nokia_info = {
|
|||
|
||||
void register_pcap(void)
|
||||
{
|
||||
pcap_file_type_subtype = wtap_register_file_type_subtypes(&pcap_info);
|
||||
pcap_nsec_file_type_subtype = wtap_register_file_type_subtypes(&pcap_nsec_info);
|
||||
pcap_aix_file_type_subtype = wtap_register_file_type_subtypes(&pcap_aix_info);
|
||||
pcap_ss990417_file_type_subtype = wtap_register_file_type_subtypes(&pcap_ss990417_info);
|
||||
pcap_ss990915_file_type_subtype = wtap_register_file_type_subtypes(&pcap_ss990915_info);
|
||||
pcap_ss991029_file_type_subtype = wtap_register_file_type_subtypes(&pcap_ss991029_info);
|
||||
pcap_nokia_file_type_subtype = wtap_register_file_type_subtypes(&pcap_nokia_info);
|
||||
pcap_file_type_subtype = wtap_register_file_type_subtype(&pcap_info);
|
||||
pcap_nsec_file_type_subtype = wtap_register_file_type_subtype(&pcap_nsec_info);
|
||||
pcap_aix_file_type_subtype = wtap_register_file_type_subtype(&pcap_aix_info);
|
||||
pcap_ss990417_file_type_subtype = wtap_register_file_type_subtype(&pcap_ss990417_info);
|
||||
pcap_ss990915_file_type_subtype = wtap_register_file_type_subtype(&pcap_ss990915_info);
|
||||
pcap_ss991029_file_type_subtype = wtap_register_file_type_subtype(&pcap_ss991029_info);
|
||||
pcap_nokia_file_type_subtype = wtap_register_file_type_subtype(&pcap_nokia_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -379,7 +379,7 @@ static const struct file_type_subtype_info logcat_info = {
|
|||
|
||||
void register_logcat(void)
|
||||
{
|
||||
logcat_file_type_subtype = wtap_register_file_type_subtypes(&logcat_info);
|
||||
logcat_file_type_subtype = wtap_register_file_type_subtype(&logcat_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -721,13 +721,13 @@ static const struct file_type_subtype_info logcat_text_long_info = {
|
|||
|
||||
void register_logcat_text(void)
|
||||
{
|
||||
logcat_text_brief_file_type_subtype = wtap_register_file_type_subtypes(&logcat_text_brief_info);
|
||||
logcat_text_process_file_type_subtype = wtap_register_file_type_subtypes(&logcat_text_process_info);
|
||||
logcat_text_tag_file_type_subtype = wtap_register_file_type_subtypes(&logcat_text_tag_info);
|
||||
logcat_text_thread_file_type_subtype = wtap_register_file_type_subtypes(&logcat_text_thread_info);
|
||||
logcat_text_time_file_type_subtype = wtap_register_file_type_subtypes(&logcat_text_time_info);
|
||||
logcat_text_threadtime_file_type_subtype = wtap_register_file_type_subtypes(&logcat_text_threadtime_info);
|
||||
logcat_text_long_file_type_subtype = wtap_register_file_type_subtypes(&logcat_text_long_info);
|
||||
logcat_text_brief_file_type_subtype = wtap_register_file_type_subtype(&logcat_text_brief_info);
|
||||
logcat_text_process_file_type_subtype = wtap_register_file_type_subtype(&logcat_text_process_info);
|
||||
logcat_text_tag_file_type_subtype = wtap_register_file_type_subtype(&logcat_text_tag_info);
|
||||
logcat_text_thread_file_type_subtype = wtap_register_file_type_subtype(&logcat_text_thread_info);
|
||||
logcat_text_time_file_type_subtype = wtap_register_file_type_subtype(&logcat_text_time_info);
|
||||
logcat_text_threadtime_file_type_subtype = wtap_register_file_type_subtype(&logcat_text_threadtime_info);
|
||||
logcat_text_long_file_type_subtype = wtap_register_file_type_subtype(&logcat_text_long_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -188,13 +188,13 @@ void register_mime(void)
|
|||
{
|
||||
int jpeg_jfif_file_type_subtype;
|
||||
|
||||
mime_file_type_subtype = wtap_register_file_type_subtypes(&mime_info);
|
||||
mime_file_type_subtype = wtap_register_file_type_subtype(&mime_info);
|
||||
|
||||
/*
|
||||
* Obsoleted by "mime", but we want it for the backwards-
|
||||
* compatibility table for Lua.
|
||||
*/
|
||||
jpeg_jfif_file_type_subtype = wtap_register_file_type_subtypes(&jpeg_jfif_info);
|
||||
jpeg_jfif_file_type_subtype = wtap_register_file_type_subtype(&jpeg_jfif_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -410,7 +410,7 @@ static const struct file_type_subtype_info mp2t_info = {
|
|||
|
||||
void register_mp2t(void)
|
||||
{
|
||||
mp2t_file_type_subtype = wtap_register_file_type_subtypes(&mp2t_info);
|
||||
mp2t_file_type_subtype = wtap_register_file_type_subtype(&mp2t_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -69,7 +69,7 @@ static const struct file_type_subtype_info mp4_info = {
|
|||
|
||||
void register_mp4(void)
|
||||
{
|
||||
mp4_file_type_subtype = wtap_register_file_type_subtypes(&mp4_info);
|
||||
mp4_file_type_subtype = wtap_register_file_type_subtype(&mp4_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -282,7 +282,7 @@ static const struct file_type_subtype_info mpeg_info = {
|
|||
|
||||
void register_mpeg(void)
|
||||
{
|
||||
mpeg_file_type_subtype = wtap_register_file_type_subtypes(&mpeg_info);
|
||||
mpeg_file_type_subtype = wtap_register_file_type_subtype(&mpeg_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -269,7 +269,7 @@ static const struct file_type_subtype_info mplog_info = {
|
|||
|
||||
void register_mplog(void)
|
||||
{
|
||||
mplog_file_type_subtype = wtap_register_file_type_subtypes(&mplog_info);
|
||||
mplog_file_type_subtype = wtap_register_file_type_subtype(&mplog_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -2007,8 +2007,8 @@ static const struct file_type_subtype_info netmon_2_x_info = {
|
|||
|
||||
void register_netmon(void)
|
||||
{
|
||||
netmon_1_x_file_type_subtype = wtap_register_file_type_subtypes(&netmon_1_x_info);
|
||||
netmon_2_x_file_type_subtype = wtap_register_file_type_subtypes(&netmon_2_x_info);
|
||||
netmon_1_x_file_type_subtype = wtap_register_file_type_subtype(&netmon_1_x_info);
|
||||
netmon_2_x_file_type_subtype = wtap_register_file_type_subtype(&netmon_2_x_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -2469,10 +2469,10 @@ static const struct file_type_subtype_info nstrace_3_5_info = {
|
|||
|
||||
void register_netscaler(void)
|
||||
{
|
||||
nstrace_1_0_file_type_subtype = wtap_register_file_type_subtypes(&nstrace_1_0_info);
|
||||
nstrace_2_0_file_type_subtype = wtap_register_file_type_subtypes(&nstrace_2_0_info);
|
||||
nstrace_3_0_file_type_subtype = wtap_register_file_type_subtypes(&nstrace_3_0_info);
|
||||
nstrace_3_5_file_type_subtype = wtap_register_file_type_subtypes(&nstrace_3_5_info);
|
||||
nstrace_1_0_file_type_subtype = wtap_register_file_type_subtype(&nstrace_1_0_info);
|
||||
nstrace_2_0_file_type_subtype = wtap_register_file_type_subtype(&nstrace_2_0_info);
|
||||
nstrace_3_0_file_type_subtype = wtap_register_file_type_subtype(&nstrace_3_0_info);
|
||||
nstrace_3_5_file_type_subtype = wtap_register_file_type_subtype(&nstrace_3_5_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -465,7 +465,7 @@ static const struct file_type_subtype_info netscreen_info = {
|
|||
|
||||
void register_netscreen(void)
|
||||
{
|
||||
netscreen_file_type_subtype = wtap_register_file_type_subtypes(&netscreen_info);
|
||||
netscreen_file_type_subtype = wtap_register_file_type_subtype(&netscreen_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -812,7 +812,7 @@ static const struct file_type_subtype_info nettl_info = {
|
|||
|
||||
void register_nettl(void)
|
||||
{
|
||||
nettl_file_type_subtype = wtap_register_file_type_subtypes(&nettl_info);
|
||||
nettl_file_type_subtype = wtap_register_file_type_subtype(&nettl_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -846,7 +846,7 @@ static const struct file_type_subtype_info nettrace_3gpp_32_423_info = {
|
|||
|
||||
void register_nettrace_3gpp_32_423(void)
|
||||
{
|
||||
nettrace_3gpp_32_423_file_type_subtype = wtap_register_file_type_subtypes(&nettrace_3gpp_32_423_info);
|
||||
nettrace_3gpp_32_423_file_type_subtype = wtap_register_file_type_subtype(&nettrace_3gpp_32_423_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -895,7 +895,7 @@ static const struct file_type_subtype_info network_instruments_info = {
|
|||
|
||||
void register_network_instruments(void)
|
||||
{
|
||||
network_instruments_file_type_subtype = wtap_register_file_type_subtypes(&network_instruments_info);
|
||||
network_instruments_file_type_subtype = wtap_register_file_type_subtype(&network_instruments_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -2870,8 +2870,8 @@ static const struct file_type_subtype_info ngsniffer_compressed_info = {
|
|||
|
||||
void register_ngsniffer(void)
|
||||
{
|
||||
ngsniffer_uncompressed_file_type_subtype = wtap_register_file_type_subtypes(&ngsniffer_uncompressed_info);
|
||||
ngsniffer_compressed_file_type_subtype = wtap_register_file_type_subtypes(&ngsniffer_compressed_info);
|
||||
ngsniffer_uncompressed_file_type_subtype = wtap_register_file_type_subtype(&ngsniffer_uncompressed_info);
|
||||
ngsniffer_compressed_file_type_subtype = wtap_register_file_type_subtype(&ngsniffer_compressed_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -392,7 +392,7 @@ static const struct file_type_subtype_info packetlogger_info = {
|
|||
|
||||
void register_packetlogger(void)
|
||||
{
|
||||
packetlogger_file_type_subtype = wtap_register_file_type_subtypes(&packetlogger_info);
|
||||
packetlogger_file_type_subtype = wtap_register_file_type_subtype(&packetlogger_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -5092,7 +5092,7 @@ static const struct file_type_subtype_info pcapng_info = {
|
|||
|
||||
void register_pcapng(void)
|
||||
{
|
||||
pcapng_file_type_subtype = wtap_register_file_type_subtypes(&pcapng_info);
|
||||
pcapng_file_type_subtype = wtap_register_file_type_subtype(&pcapng_info);
|
||||
|
||||
wtap_register_backwards_compatibility_lua_name("PCAPNG",
|
||||
pcapng_file_type_subtype);
|
||||
|
|
|
@ -690,8 +690,8 @@ static const struct file_type_subtype_info peekclassic_v7_info = {
|
|||
|
||||
void register_peekclassic(void)
|
||||
{
|
||||
peekclassic_v56_file_type_subtype = wtap_register_file_type_subtypes(&peekclassic_v56_info);
|
||||
peekclassic_v7_file_type_subtype = wtap_register_file_type_subtypes(&peekclassic_v7_info);
|
||||
peekclassic_v56_file_type_subtype = wtap_register_file_type_subtype(&peekclassic_v56_info);
|
||||
peekclassic_v7_file_type_subtype = wtap_register_file_type_subtype(&peekclassic_v7_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -900,7 +900,7 @@ static const struct file_type_subtype_info peektagged_info = {
|
|||
|
||||
void register_peektagged(void)
|
||||
{
|
||||
peektagged_file_type_subtype = wtap_register_file_type_subtypes(&peektagged_info);
|
||||
peektagged_file_type_subtype = wtap_register_file_type_subtype(&peektagged_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -811,7 +811,7 @@ static const struct file_type_subtype_info pppdump_info = {
|
|||
|
||||
void register_pppdump(void)
|
||||
{
|
||||
pppdump_file_type_subtype = wtap_register_file_type_subtypes(&pppdump_info);
|
||||
pppdump_file_type_subtype = wtap_register_file_type_subtype(&pppdump_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -387,7 +387,7 @@ static const struct file_type_subtype_info radcom_info = {
|
|||
|
||||
void register_radcom(void)
|
||||
{
|
||||
radcom_file_type_subtype = wtap_register_file_type_subtypes(&radcom_info);
|
||||
radcom_file_type_subtype = wtap_register_file_type_subtype(&radcom_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -116,7 +116,7 @@ static const struct file_type_subtype_info rfc7468_info = {
|
|||
|
||||
void register_rfc7468(void)
|
||||
{
|
||||
rfc7468_file_type_subtype = wtap_register_file_type_subtypes(&rfc7468_info);
|
||||
rfc7468_file_type_subtype = wtap_register_file_type_subtype(&rfc7468_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -99,7 +99,7 @@ static const struct file_type_subtype_info ruby_marshal_info = {
|
|||
|
||||
void register_ruby_marshal(void)
|
||||
{
|
||||
ruby_marshal_file_type_subtype = wtap_register_file_type_subtypes(&ruby_marshal_info);
|
||||
ruby_marshal_file_type_subtype = wtap_register_file_type_subtype(&ruby_marshal_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -945,8 +945,8 @@ static const struct file_type_subtype_info shomiti_info = {
|
|||
|
||||
void register_snoop(void)
|
||||
{
|
||||
snoop_file_type_subtype = wtap_register_file_type_subtypes(&snoop_info);
|
||||
shomiti_file_type_subtype = wtap_register_file_type_subtypes(&shomiti_info);
|
||||
snoop_file_type_subtype = wtap_register_file_type_subtype(&snoop_info);
|
||||
shomiti_file_type_subtype = wtap_register_file_type_subtype(&shomiti_info);
|
||||
|
||||
/*
|
||||
* Register names for backwards compatibility with the
|
||||
|
|
|
@ -223,7 +223,7 @@ static const struct file_type_subtype_info stanag4607_info = {
|
|||
|
||||
void register_stanag4607(void)
|
||||
{
|
||||
stanag4607_file_type_subtype = wtap_register_file_type_subtypes(&stanag4607_info);
|
||||
stanag4607_file_type_subtype = wtap_register_file_type_subtype(&stanag4607_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -251,7 +251,7 @@ static const struct file_type_subtype_info systemd_journal_info = {
|
|||
|
||||
void register_systemd_journal(void)
|
||||
{
|
||||
systemd_journal_file_type_subtype = wtap_register_file_type_subtypes(&systemd_journal_info);
|
||||
systemd_journal_file_type_subtype = wtap_register_file_type_subtype(&systemd_journal_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -61,7 +61,7 @@ static const struct file_type_subtype_info tnef_info = {
|
|||
|
||||
void register_tnef(void)
|
||||
{
|
||||
tnef_file_type_subtype = wtap_register_file_type_subtypes(&tnef_info);
|
||||
tnef_file_type_subtype = wtap_register_file_type_subtype(&tnef_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -444,7 +444,7 @@ static const struct file_type_subtype_info toshiba_info = {
|
|||
|
||||
void register_toshiba(void)
|
||||
{
|
||||
toshiba_file_type_subtype = wtap_register_file_type_subtypes(&toshiba_info);
|
||||
toshiba_file_type_subtype = wtap_register_file_type_subtype(&toshiba_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -876,7 +876,7 @@ static const struct file_type_subtype_info visual_info = {
|
|||
|
||||
void register_visual(void)
|
||||
{
|
||||
visual_file_type_subtype = wtap_register_file_type_subtypes(&visual_info);
|
||||
visual_file_type_subtype = wtap_register_file_type_subtype(&visual_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -543,7 +543,7 @@ static const struct file_type_subtype_info vms_info = {
|
|||
|
||||
void register_vms(void)
|
||||
{
|
||||
vms_file_type_subtype = wtap_register_file_type_subtypes(&vms_info);
|
||||
vms_file_type_subtype = wtap_register_file_type_subtype(&vms_info);
|
||||
|
||||
/*
|
||||
* Register name for backwards compatibility with the
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -2278,7 +2278,7 @@ void wtap_deregister_open_info(const gchar *name);
|
|||
WS_DLL_PUBLIC
|
||||
unsigned int open_info_name_to_type(const char *name);
|
||||
WS_DLL_PUBLIC
|
||||
int wtap_register_file_type_subtypes(const struct file_type_subtype_info* fi);
|
||||
int wtap_register_file_type_subtype(const struct file_type_subtype_info* fi);
|
||||
WS_DLL_PUBLIC
|
||||
void wtap_deregister_file_type_subtype(const int file_type_subtype);
|
||||
|
||||
|
|
Loading…
Reference in New Issue