diff options
Diffstat (limited to 'epan')
142 files changed, 178 insertions, 528 deletions
diff --git a/epan/dissectors/asn1/atn-cm/packet-atn-cm-template.c b/epan/dissectors/asn1/atn-cm/packet-atn-cm-template.c index 479d794ed3..e4628178ba 100644 --- a/epan/dissectors/asn1/atn-cm/packet-atn-cm-template.c +++ b/epan/dissectors/asn1/atn-cm/packet-atn-cm-template.c @@ -187,10 +187,7 @@ void proto_register_atn_cm (void) }; /* register CM application */ - proto_atn_cm = proto_register_protocol( - ATN_CM_PROTO , - "ATN-CM", - "atn-cm"); + proto_atn_cm = proto_register_protocol(ATN_CM_PROTO, "ATN-CM", "atn-cm"); proto_register_field_array( proto_atn_cm, diff --git a/epan/dissectors/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/epan/dissectors/asn1/atn-cpdlc/packet-atn-cpdlc-template.c index f7249916d2..0e8bca4d24 100644 --- a/epan/dissectors/asn1/atn-cpdlc/packet-atn-cpdlc-template.c +++ b/epan/dissectors/asn1/atn-cpdlc/packet-atn-cpdlc-template.c @@ -310,10 +310,7 @@ void proto_register_atn_cpdlc (void) }; /* register CPDLC */ - proto_atn_cpdlc = proto_register_protocol( - ATN_CPDLC_PROTO , - "ATN-CPDLC", - "atn-cpdlc"); + proto_atn_cpdlc = proto_register_protocol(ATN_CPDLC_PROTO, "ATN-CPDLC", "atn-cpdlc"); proto_register_field_array( proto_atn_cpdlc, diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index f21326fd31..0a461ecd89 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -2250,9 +2250,7 @@ void proto_register_ldap(void) { prefs_register_obsolete_preference(ldap_module, "max_pdu"); - proto_cldap = proto_register_protocol( - "Connectionless Lightweight Directory Access Protocol", - "CLDAP", "cldap"); + proto_cldap = proto_register_protocol("Connectionless Lightweight Directory Access Protocol", "CLDAP", "cldap"); cldap_handle = register_dissector("cldap", dissect_mscldap, proto_cldap); ldap_tap=register_tap("ldap"); diff --git a/epan/dissectors/asn1/mpeg-audio/packet-mpeg-audio-template.c b/epan/dissectors/asn1/mpeg-audio/packet-mpeg-audio-template.c index ee622ccd9e..29e42ae227 100644 --- a/epan/dissectors/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/epan/dissectors/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -205,8 +205,7 @@ proto_register_mpeg_audio(void) #include "packet-mpeg-audio-ettarr.c" }; - proto_mpeg_audio = proto_register_protocol( - "Moving Picture Experts Group Audio", "MPEG Audio", "mpeg-audio"); + proto_mpeg_audio = proto_register_protocol("Moving Picture Experts Group Audio", "MPEG Audio", "mpeg-audio"); proto_register_field_array(proto_mpeg_audio, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c b/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c index 1356b19761..c4e8990dc6 100644 --- a/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -734,13 +734,11 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_trick_mode }; - proto_mpeg = proto_register_protocol( - "Moving Picture Experts Group", "MPEG", "mpeg"); + proto_mpeg = proto_register_protocol("Moving Picture Experts Group", "MPEG", "mpeg"); mpeg_handle = register_dissector("mpeg", dissect_mpeg, proto_mpeg); heur_subdissector_list = register_heur_dissector_list("mpeg", proto_mpeg); - proto_mpeg_pes = proto_register_protocol( - "Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); + proto_mpeg_pes = proto_register_protocol("Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); proto_register_field_array(proto_mpeg_pes, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes); diff --git a/epan/dissectors/file-tiff.c b/epan/dissectors/file-tiff.c index 01c0e16e55..ac5f4212f0 100644 --- a/epan/dissectors/file-tiff.c +++ b/epan/dissectors/file-tiff.c @@ -1139,11 +1139,7 @@ proto_register_tiff(void) }; - proto_tiff = proto_register_protocol( - "Tagged Image File Format", - "TIFF image", - "tiff" - ); + proto_tiff = proto_register_protocol("Tagged Image File Format", "TIFF image", "tiff"); register_dissector("tiff", dissect_tiff, proto_tiff); proto_register_field_array(proto_tiff, hf, array_length(hf)); diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index 8f6ceb6467..8f478f63e8 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -231,10 +231,7 @@ void proto_register_2dparityfec(void) module_t *module_2dparityfec; - proto_2dparityfec = proto_register_protocol( - "Pro-MPEG Code of Practice #3 release 2 FEC Protocol", /* name */ - "2dparityfec", /* short name */ - "2dparityfec"); /* abbrev */ + proto_2dparityfec = proto_register_protocol("Pro-MPEG Code of Practice #3 release 2 FEC Protocol", "2dparityfec", "2dparityfec"); proto_register_field_array(proto_2dparityfec, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-5co-legacy.c b/epan/dissectors/packet-5co-legacy.c index 3f2dc27e54..85dc94c71c 100644 --- a/epan/dissectors/packet-5co-legacy.c +++ b/epan/dissectors/packet-5co-legacy.c @@ -44,7 +44,7 @@ static dissector_handle_t FiveCoLegacy_handle; #define FIVECO_LEGACY_HEADER_LENGTH 6 #define FIVECO_LEGACY_MIN_LENGTH FIVECO_LEGACY_HEADER_LENGTH + 2 // Checksum is 16 bits -#define PROTO_TAG_FIVECO "5co-legacy" +#define PSNAME "5co-legacy" /* Global sample ports preferences */ #define FIVECO_PORT1 8010 /* TCP port of the FiveCo protocol */ @@ -268,7 +268,7 @@ dissect_FiveCoLegacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * return 0; /* Display fiveco in protocol column */ - col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_FIVECO); + col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); /* Clear out stuff in the info column */ col_clear(pinfo->cinfo, COL_INFO); @@ -814,7 +814,7 @@ void proto_register_FiveCoLegacy(void) /* Register the protocol name and description */ proto_FiveCoLegacy = proto_register_protocol("FiveCo's Legacy Register Access Protocol", - PROTO_TAG_FIVECO, "5co_legacy"); + PSNAME, "5co_legacy"); /* Required function calls to register the header fields and subtrees */ proto_register_field_array(proto_FiveCoLegacy, hf, array_length(hf)); diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index ddc791df53..e259c080d3 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -8935,23 +8935,11 @@ proto_register_acn(void) module_t *acn_module; expert_module_t* expert_acn; - proto_acn = proto_register_protocol ( - "Architecture for Control Networks", /* name */ - "ACN", /* short name */ - "acn" /* abbrev */ - ); - - proto_magic = proto_register_protocol( - "Magic Bullet", /* name */ - "MAGIC", /* short name */ - "magic" /* abbrev */ - ); - - proto_rdmnet = proto_register_protocol( - "RDMnet", /* name */ - "RDMnet", /* short name */ - "rdmnet" /* abbrev */ - ); + proto_acn = proto_register_protocol("Architecture for Control Networks", "ACN", "acn"); + + proto_magic = proto_register_protocol("Magic Bullet", "MAGIC", "magic"); + + proto_rdmnet = proto_register_protocol("RDMnet", "RDMnet", "rdmnet"); proto_register_field_array(proto_acn, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c index 642f954649..9c8a5f2cfd 100644 --- a/epan/dissectors/packet-app-pkix-cert.c +++ b/epan/dissectors/packet-app-pkix-cert.c @@ -78,11 +78,7 @@ proto_register_cert(void) }; /* Register the protocol name and description */ - proto_cert = proto_register_protocol( - "PKIX CERT File Format", - "PKIX Certificate", - "pkix-cert" - ); + proto_cert = proto_register_protocol("PKIX CERT File Format", "PKIX Certificate", "pkix-cert"); /* Required function calls to register the header fields * and subtrees used */ diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index c615a947b2..63895e256f 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -363,8 +363,7 @@ proto_register_asf(void) expert_module_t* expert_asf; - proto_asf = proto_register_protocol( - "Alert Standard Forum", "ASF", "asf"); + proto_asf = proto_register_protocol("Alert Standard Forum", "ASF", "asf"); proto_register_field_array(proto_asf, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c index 9c0a521baf..cf4b9e51f9 100644 --- a/epan/dissectors/packet-atn-cm.c +++ b/epan/dissectors/packet-atn-cm.c @@ -915,10 +915,7 @@ void proto_register_atn_cm (void) }; /* register CM application */ - proto_atn_cm = proto_register_protocol( - ATN_CM_PROTO , - "ATN-CM", - "atn-cm"); + proto_atn_cm = proto_register_protocol(ATN_CM_PROTO, "ATN-CM", "atn-cm"); proto_register_field_array( proto_atn_cm, diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c index c40d8f0934..fe95664bc0 100644 --- a/epan/dissectors/packet-atn-cpdlc.c +++ b/epan/dissectors/packet-atn-cpdlc.c @@ -8043,10 +8043,7 @@ void proto_register_atn_cpdlc (void) }; /* register CPDLC */ - proto_atn_cpdlc = proto_register_protocol( - ATN_CPDLC_PROTO , - "ATN-CPDLC", - "atn-cpdlc"); + proto_atn_cpdlc = proto_register_protocol(ATN_CPDLC_PROTO, "ATN-CPDLC", "atn-cpdlc"); proto_register_field_array( proto_atn_cpdlc, diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index fca8961b7b..aee96fd84a 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -5501,11 +5501,7 @@ void proto_register_batadv(void) { &ei_batadv_tvlv_tt_vlan_empty, { "batadv.tvlv_tt_vlan_empty", PI_SEQUENCE, PI_WARN, "BATADV Warn: empty VLAN", EXPFILL }}, }; - proto_batadv_plugin = proto_register_protocol( - "B.A.T.M.A.N. Advanced Protocol", - "BATADV", /* short name */ - "batadv" /* abbrev */ - ); + proto_batadv_plugin = proto_register_protocol("B.A.T.M.A.N. Advanced Protocol", "BATADV", "batadv"); batman_handle = register_dissector("batadv",dissect_batadv_plugin,proto_batadv_plugin); diff --git a/epan/dissectors/packet-bmp.c b/epan/dissectors/packet-bmp.c index 7c59149b50..11e11a071d 100644 --- a/epan/dissectors/packet-bmp.c +++ b/epan/dissectors/packet-bmp.c @@ -1726,11 +1726,7 @@ proto_register_bmp(void) module_t *bmp_module; - proto_bmp = proto_register_protocol( - "BGP Monitoring Protocol", /* name */ - "BMP", /* short name */ - "bmp" /* abbrev */ - ); + proto_bmp = proto_register_protocol("BGP Monitoring Protocol", "BMP", "bmp"); bmp_handle = register_dissector("bmp", dissect_bmp, proto_bmp); diff --git a/epan/dissectors/packet-bpsec.c b/epan/dissectors/packet-bpsec.c index 3c33008c58..03a1bb2196 100644 --- a/epan/dissectors/packet-bpsec.c +++ b/epan/dissectors/packet-bpsec.c @@ -479,11 +479,7 @@ static void reinit_bpsec(void) { /// Overall registration of the protocol void proto_register_bpsec(void) { - proto_bpsec = proto_register_protocol( - "DTN Bundle Protocol Security", /* name */ - "BPSec", /* short name */ - "bpsec" /* abbrev */ - ); + proto_bpsec = proto_register_protocol("DTN Bundle Protocol Security", "BPSec", "bpsec"); proto_register_field_array(proto_bpsec, fields, array_length(fields)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-bpv7.c b/epan/dissectors/packet-bpv7.c index 7408bbd51e..f0ea84698a 100644 --- a/epan/dissectors/packet-bpv7.c +++ b/epan/dissectors/packet-bpv7.c @@ -2277,11 +2277,7 @@ static gchar * bp_build_filter(packet_info *pinfo, void *user_data _U_) { /// Overall registration of the protocol void proto_register_bpv7(void) { - proto_bp = proto_register_protocol( - "DTN Bundle Protocol Version 7", /* name */ - "BPv7", /* short name */ - "bpv7" /* abbrev */ - ); + proto_bp = proto_register_protocol("DTN Bundle Protocol Version 7", "BPv7", "bpv7"); register_init_routine(&bp_init); register_cleanup_routine(&bp_cleanup); @@ -2362,11 +2358,7 @@ void proto_register_bpv7(void) { register_conversation_table(proto_bp, TRUE, bp_conv_packet, bp_endp_packet); register_conversation_filter("bpv7", "BPv7", bp_filter_valid, bp_build_filter, NULL); - proto_bp_admin = proto_register_protocol( - "BPv7 Administrative Record", /* name */ - "BPv7 Admin", /* short name */ - "bpv7.admin_rec" /* abbrev */ - ); + proto_bp_admin = proto_register_protocol("BPv7 Administrative Record", "BPv7 Admin", "bpv7.admin_rec"); handle_admin = register_dissector("bpv7.admin_rec", dissect_payload_admin, proto_bp_admin); admin_dissectors = register_custom_dissector_table("bpv7.admin_record_type", "BPv7 Administrative Record Type", proto_bp_admin, g_int64_hash, g_int64_equal, g_free); proto_admintype = proto_register_protocol_in_name_only("BPv7 Administrative Record Type", "Admin Type", "bpv7.admin_record_type", proto_bp, FT_PROTOCOL); diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index 790381b6b1..9f40fda647 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -378,8 +378,7 @@ proto_register_brdwlk(void) }; /* Register the protocol name and description */ - proto_brdwlk = proto_register_protocol("Boardwalk", - "Boardwalk", "brdwlk"); + proto_brdwlk = proto_register_protocol("Boardwalk", "Boardwalk", "brdwlk"); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_brdwlk, hf, array_length(hf)); diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c index 92b273a9d2..693ab57785 100644 --- a/epan/dissectors/packet-c15ch.c +++ b/epan/dissectors/packet-c15ch.c @@ -7347,11 +7347,7 @@ void proto_register_c15ch_hbeat(void) &ett_c15ch_hbeat }; - proto_c15ch_hbeat = proto_register_protocol( - "C15 Call History Heartbeat Protocol", /* name */ - "C15HBEAT", /* short name */ - "c15hbeat" /* abbreviation */ - ); + proto_c15ch_hbeat = proto_register_protocol("C15 Call History Heartbeat Protocol", "C15HBEAT", "c15hbeat"); proto_register_field_array(proto_c15ch_hbeat, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -11866,53 +11862,33 @@ void proto_register_c15ch(void) /* protocols */ /* first level: Call History Common Header */ - proto_c15ch = proto_register_protocol( - "C15 Call History Common Header Protocol", - "C15.ch", - "c15.ch" - ); + proto_c15ch = proto_register_protocol("C15 Call History Common Header Protocol", "C15.ch", "c15.ch"); proto_register_field_array(proto_c15ch, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); c15ch_handle = register_dissector("c15.ch", dissect_c15ch, proto_c15ch); /* second level dissector */ - proto_c15ch_second_level = proto_register_protocol( - "C15 Call History Protocol", - "C15", - "c15" - ); + proto_c15ch_second_level = proto_register_protocol("C15 Call History Protocol", "C15", "c15"); proto_register_field_array(proto_c15ch_second_level, hf_second_level, array_length(hf_second_level)); proto_register_subtree_array(ett_second_level, array_length(ett_second_level)); c15ch_dissector_table = register_dissector_table("c15", "C15", proto_c15ch, FT_UINT32, BASE_DEC); /* third level */ /* tone */ - proto_c15ch_third_level_tone = proto_register_protocol( - "C15 Tone", - "C15.TONE", - "c15.tone" - ); + proto_c15ch_third_level_tone = proto_register_protocol("C15 Tone", "C15.TONE", "c15.tone"); proto_register_field_array(proto_c15ch_third_level_tone, hf_third_level_tone, array_length(hf_third_level_tone)); proto_register_subtree_array(ett_third_level_tone, array_length(ett_third_level_tone)); c15ch_tone_dissector_table = register_dissector_table("c15.tone", "C15.TONE", proto_c15ch_third_level_tone, FT_UINT32, BASE_DEC); /* inc gwe */ - proto_c15ch_third_level_inc_gwe = proto_register_protocol( - "C15 Incoming GWE", - "C15.INC_GWE", - "c15.inc_gwe" - ); + proto_c15ch_third_level_inc_gwe = proto_register_protocol("C15 Incoming GWE", "C15.INC_GWE", "c15.inc_gwe"); proto_register_field_array(proto_c15ch_third_level_inc_gwe, hf_third_level_inc_gwe, array_length(hf_third_level_inc_gwe)); proto_register_subtree_array(ett_third_level_inc_gwe, array_length(ett_third_level_inc_gwe)); c15ch_inc_gwe_dissector_table = register_dissector_table("c15.inc_gwe", "C15.INC_GWE", proto_c15ch_third_level_inc_gwe, FT_UINT32, BASE_DEC); /* out gwe */ - proto_c15ch_third_level_out_gwe = proto_register_protocol( - "C15 Outgoing GWE", - "C15.out_gwe", - "c15.out_gwe" - ); + proto_c15ch_third_level_out_gwe = proto_register_protocol("C15 Outgoing GWE", "C15.out_gwe", "c15.out_gwe"); proto_register_field_array(proto_c15ch_third_level_out_gwe, hf_third_level_out_gwe, array_length(hf_third_level_out_gwe)); proto_register_subtree_array(ett_third_level_out_gwe, array_length(ett_third_level_out_gwe)); c15ch_out_gwe_dissector_table = register_dissector_table("c15.out_gwe", "C15.out_gwe", proto_c15ch_third_level_out_gwe, FT_UINT32, BASE_DEC); diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c index 5f247f62f8..dd9f059e2a 100644 --- a/epan/dissectors/packet-canopen.c +++ b/epan/dissectors/packet-canopen.c @@ -1780,9 +1780,7 @@ proto_register_canopen(void) &ett_canopen_em_er }; - proto_canopen = proto_register_protocol("CANopen", - "CANOPEN", - "canopen"); + proto_canopen = proto_register_protocol("CANopen", "CANOPEN", "canopen"); proto_register_field_array(proto_canopen, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index 3ab4cf5d5c..f7fc2f395b 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -3455,10 +3455,7 @@ proto_register_cipmotion(void) }; /* Create a CIP Motion protocol handle */ - proto_cipmotion = proto_register_protocol( - "Common Industrial Protocol, Motion", /* Full name of protocol */ - "CIP Motion", /* Short name of protocol */ - "cipm"); /* Abbreviated name of protocol */ + proto_cipmotion = proto_register_protocol("Common Industrial Protocol, Motion", "CIP Motion", "cipm"); proto_cipmotion3 = proto_register_protocol_in_name_only( "Common Industrial Protocol, Motion - Rev 3", diff --git a/epan/dissectors/packet-cl3.c b/epan/dissectors/packet-cl3.c index 985a9a40f3..0b1aa8f60d 100644 --- a/epan/dissectors/packet-cl3.c +++ b/epan/dissectors/packet-cl3.c @@ -179,11 +179,7 @@ proto_register_cl3(void) { expert_module_t* expert_cl3; - proto_cl3 = proto_register_protocol( - "CableLabs Layer 3 Protocol", /* name */ - "CL3", /* short name */ - "cl3" /* abbrev */ - ); + proto_cl3 = proto_register_protocol("CableLabs Layer 3 Protocol", "CL3", "cl3"); proto_register_field_array(proto_cl3, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-cl3dcw.c b/epan/dissectors/packet-cl3dcw.c index 0d6ba4c188..bc2f123d23 100644 --- a/epan/dissectors/packet-cl3dcw.c +++ b/epan/dissectors/packet-cl3dcw.c @@ -318,11 +318,7 @@ proto_register_cl3dcw(void) { expert_module_t* expert_cl3dcw; - proto_cl3dcw = proto_register_protocol( - "CableLabs Dual-Channel Wi-Fi", /* name */ - "cl3dcw", /* short name */ - "cl3dcw" /* abbrev */ - ); + proto_cl3dcw = proto_register_protocol("CableLabs Dual-Channel Wi-Fi", "cl3dcw", "cl3dcw"); proto_register_field_array(proto_cl3dcw, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-clique-rm.c b/epan/dissectors/packet-clique-rm.c index 6a5097e6f9..358129563c 100644 --- a/epan/dissectors/packet-clique-rm.c +++ b/epan/dissectors/packet-clique-rm.c @@ -450,8 +450,7 @@ proto_register_clique_rm(void) }; /* Register the protocol name and description */ - proto_clique_rm = proto_register_protocol( - "Clique Reliable Multicast Protocol", "Clique-rm", "clique-rm"); + proto_clique_rm = proto_register_protocol("Clique Reliable Multicast Protocol", "Clique-rm", "clique-rm"); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_clique_rm, hf, array_length(hf)); diff --git a/epan/dissectors/packet-cose.c b/epan/dissectors/packet-cose.c index e122186013..5f5a7e6e55 100644 --- a/epan/dissectors/packet-cose.c +++ b/epan/dissectors/packet-cose.c @@ -1244,11 +1244,7 @@ static void cose_reinit(void) { /// Overall registration of the protocol void proto_register_cose(void) { - proto_cose = proto_register_protocol( - "CBOR Object Signing and Encryption", /* name */ - proto_name_cose, /* short name */ - "cose" /* abbrev */ - ); + proto_cose = proto_register_protocol("CBOR Object Signing and Encryption", proto_name_cose, "cose"); register_init_routine(&cose_init); register_cleanup_routine(&cose_cleanup); diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c index 1315469030..107583a58b 100644 --- a/epan/dissectors/packet-dcerpc-browser.c +++ b/epan/dissectors/packet-dcerpc-browser.c @@ -1139,8 +1139,7 @@ static hf_register_info hf[] = { &ett_dcerpc_browser }; - proto_dcerpc_browser = proto_register_protocol( - "RPC Browser", "RPC_BROWSER", "rpc_browser"); + proto_dcerpc_browser = proto_register_protocol("RPC Browser", "RPC_BROWSER", "rpc_browser"); proto_register_field_array(proto_dcerpc_browser, hf, array_length(hf)); diff --git a/epan/dissectors/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c index 3578150f49..a83302117e 100644 --- a/epan/dissectors/packet-dcerpc-budb.c +++ b/epan/dissectors/packet-dcerpc-budb.c @@ -584,7 +584,7 @@ budb_dissect_dumpEntry_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int budb_dissect_time_t(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hf_index, guint32 param _U_) { - + offset=dissect_ndr_time_t(tvb, offset, pinfo, tree, di, drep, hf_index, NULL); return offset; @@ -4836,9 +4836,7 @@ proto_register_budb(void) }; - proto_budb = proto_register_protocol( - "DCE/DFS BUDB", - "BUDB", "budb"); + proto_budb = proto_register_protocol("DCE/DFS BUDB", "BUDB", "budb"); proto_register_field_array(proto_budb, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c index 7d9bfdf610..a5f74ae765 100644 --- a/epan/dissectors/packet-dcerpc-butc.c +++ b/epan/dissectors/packet-dcerpc-butc.c @@ -357,7 +357,7 @@ butc_dissect_tc_dumpDesc_partition(tvbuff_t *tvb, int offset, packet_info *pinfo static int butc_dissect_time_t(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hf_index, guint32 param _U_) { - + offset=dissect_ndr_time_t(tvb, offset, pinfo, tree, di, drep, hf_index, NULL); return offset; @@ -2884,9 +2884,7 @@ proto_register_butc(void) }; - proto_butc = proto_register_protocol( - "DCE/RPC BUTC", - "BUTC", "butc"); + proto_butc = proto_register_protocol("DCE/RPC BUTC", "BUTC", "butc"); proto_register_field_array(proto_butc, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c index 3979760888..812ee70af0 100644 --- a/epan/dissectors/packet-dcerpc-frsapi.c +++ b/epan/dissectors/packet-dcerpc-frsapi.c @@ -71,8 +71,7 @@ proto_register_dcerpc_frsapi(void) }; - proto_dcerpc_frsapi = proto_register_protocol( - "Microsoft File Replication Service API", "FRSAPI", "frsapi"); + proto_dcerpc_frsapi = proto_register_protocol("Microsoft File Replication Service API", "FRSAPI", "frsapi"); proto_register_field_array(proto_dcerpc_frsapi, hf, array_length(hf)); diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c index a3b120cf67..a00626d8ce 100644 --- a/epan/dissectors/packet-dcerpc-messenger.c +++ b/epan/dissectors/packet-dcerpc-messenger.c @@ -114,8 +114,7 @@ proto_register_dcerpc_messenger(void) &ett_dcerpc_messenger }; - proto_dcerpc_messenger = proto_register_protocol( - "Microsoft Messenger Service", "Messenger", "messenger"); + proto_dcerpc_messenger = proto_register_protocol("Microsoft Messenger Service", "Messenger", "messenger"); proto_register_field_array (proto_dcerpc_messenger, hf, array_length (hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-dcerpc-pnp.c b/epan/dissectors/packet-dcerpc-pnp.c index 1b519b364a..cc055e9fe8 100644 --- a/epan/dissectors/packet-dcerpc-pnp.c +++ b/epan/dissectors/packet-dcerpc-pnp.c @@ -194,8 +194,7 @@ proto_register_dcerpc_pnp(void) }; - proto_dcerpc_pnp = proto_register_protocol( - "Microsoft Plug and Play service", "PNP", "pnp"); + proto_dcerpc_pnp = proto_register_protocol("Microsoft Plug and Play service", "PNP", "pnp"); proto_register_field_array(proto_dcerpc_pnp, hf, array_length(hf)); diff --git a/epan/dissectors/packet-dcerpc-rras.c b/epan/dissectors/packet-dcerpc-rras.c index 21366cb144..acee1335d1 100644 --- a/epan/dissectors/packet-dcerpc-rras.c +++ b/epan/dissectors/packet-dcerpc-rras.c @@ -132,8 +132,7 @@ proto_register_dcerpc_rras(void) }; - proto_dcerpc_rras = proto_register_protocol( - "Microsoft Routing and Remote Access Service", "RRAS", "rras"); + proto_dcerpc_rras = proto_register_protocol("Microsoft Routing and Remote Access Service", "RRAS", "rras"); proto_register_field_array(proto_dcerpc_rras, hf, array_length(hf)); diff --git a/epan/dissectors/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c index e3b15caa61..7864c56072 100644 --- a/epan/dissectors/packet-dcerpc-rs_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_plcy.c @@ -65,8 +65,7 @@ proto_register_dcerpc_rs_plcy(void) &ett_dcerpc_rs_plcy }; - proto_dcerpc_rs_plcy = proto_register_protocol( - "RS Interface properties", "RS_PLCY", "rs_plcy"); + proto_dcerpc_rs_plcy = proto_register_protocol("RS Interface properties", "RS_PLCY", "rs_plcy"); proto_register_field_array(proto_dcerpc_rs_plcy, hf, array_length(hf)); diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 36fc748385..5f29238ab2 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -8885,8 +8885,7 @@ proto_register_dcerpc_spoolss(void) expert_module_t* expert_dcerpc_spoolss; - proto_dcerpc_spoolss = proto_register_protocol( - "Microsoft Spool Subsystem", "SPOOLSS", "spoolss"); + proto_dcerpc_spoolss = proto_register_protocol("Microsoft Spool Subsystem", "SPOOLSS", "spoolss"); proto_register_field_array(proto_dcerpc_spoolss, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c index 01272563e0..fe0c992aa2 100644 --- a/epan/dissectors/packet-dcerpc-tapi.c +++ b/epan/dissectors/packet-dcerpc-tapi.c @@ -211,8 +211,7 @@ static hf_register_info hf[] = { &ett_dcerpc_tapi }; - proto_dcerpc_tapi = proto_register_protocol( - "Microsoft Telephony API Service", "TAPI", "tapi"); + proto_dcerpc_tapi = proto_register_protocol("Microsoft Telephony API Service", "TAPI", "tapi"); proto_register_field_array(proto_dcerpc_tapi, hf, array_length(hf)); diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c index b4a2228645..6ae4aa192c 100644 --- a/epan/dissectors/packet-dcerpc-trksvr.c +++ b/epan/dissectors/packet-dcerpc-trksvr.c @@ -65,8 +65,7 @@ static hf_register_info hf[] = { &ett_dcerpc_trksvr }; - proto_dcerpc_trksvr = proto_register_protocol( - "Microsoft Distributed Link Tracking Server Service", "TRKSVR", "trksvr"); + proto_dcerpc_trksvr = proto_register_protocol("Microsoft Distributed Link Tracking Server Service", "TRKSVR", "trksvr"); proto_register_field_array(proto_dcerpc_trksvr, hf, array_length(hf)); diff --git a/epan/dissectors/packet-discard.c b/epan/dissectors/packet-discard.c index 1cce28ddd2..2e86d142a0 100644 --- a/epan/dissectors/packet-discard.c +++ b/epan/dissectors/packet-discard.c @@ -133,10 +133,7 @@ proto_register_discard(void) module_t *module_data; - proto_discard = proto_register_protocol( - "Discard Protocol", - "DISCARD", - "discard"); + proto_discard = proto_register_protocol("Discard Protocol", "DISCARD", "discard"); proto_register_field_array(proto_discard, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-dsr.c b/epan/dissectors/packet-dsr.c index 35506a3242..4bdedeb1c6 100644 --- a/epan/dissectors/packet-dsr.c +++ b/epan/dissectors/packet-dsr.c @@ -726,10 +726,7 @@ proto_register_dsr(void) }; /* Register the protocol name and description */ - proto_dsr = proto_register_protocol( - "Dynamic Source Routing", - "DSR", - "dsr"); + proto_dsr = proto_register_protocol("Dynamic Source Routing", "DSR", "dsr"); dsr_handle = register_dissector("dsr", dissect_dsr, proto_dsr); /* Required function calls to register the header fields and subtrees */ diff --git a/epan/dissectors/packet-dtcp-ip.c b/epan/dissectors/packet-dtcp-ip.c index d26c518666..c5c545cc52 100644 --- a/epan/dissectors/packet-dtcp-ip.c +++ b/epan/dissectors/packet-dtcp-ip.c @@ -272,9 +272,7 @@ proto_register_dtcp_ip(void) &ett_dtcp_ip_ake_procedure }; - proto_dtcp_ip = proto_register_protocol( - "Digital Transmission Content Protection over IP", - "DTCP-IP", "dtcp-ip"); + proto_dtcp_ip = proto_register_protocol("Digital Transmission Content Protection over IP", "DTCP-IP", "dtcp-ip"); proto_register_field_array(proto_dtcp_ip, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c index a4352d11f6..50542b6069 100644 --- a/epan/dissectors/packet-dvb-ait.c +++ b/epan/dissectors/packet-dvb-ait.c @@ -551,8 +551,7 @@ proto_register_dvb_ait(void) FT_UINT8, BASE_HEX, VALS(app_ctrl_code), 0, NULL, HFILL } } }; - proto_dvb_ait = proto_register_protocol( - "DVB Application Information Table", "DVB AIT", "dvb_ait"); + proto_dvb_ait = proto_register_protocol("DVB Application Information Table", "DVB AIT", "dvb_ait"); proto_register_field_array(proto_dvb_ait, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index c0ed34c996..a7bbd0fdc9 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -3743,10 +3743,7 @@ proto_register_e212(void) /* * Register the protocol name and description */ - proto_e212 = proto_register_protocol( - "ITU-T E.212 number", - "E.212", - "e212"); + proto_e212 = proto_register_protocol("ITU-T E.212 number", "E.212", "e212"); /* * Required function calls to register diff --git a/epan/dissectors/packet-ebhscr.c b/epan/dissectors/packet-ebhscr.c index 535e124fff..e81536f2fb 100644 --- a/epan/dissectors/packet-ebhscr.c +++ b/epan/dissectors/packet-ebhscr.c @@ -1822,11 +1822,7 @@ proto_register_ebhscr(void) }, }; - proto_ebhscr = proto_register_protocol( - "EBHSCR Protocol", - "EBHSCR", - "ebhscr" - ); + proto_ebhscr = proto_register_protocol("EBHSCR Protocol", "EBHSCR", "ebhscr"); proto_register_field_array(proto_ebhscr, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 86df9d2aad..3c6634556e 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -3353,11 +3353,7 @@ proto_register_eigrp(void) expert_module_t* expert_eigrp; /* Register the protocol name and description */ - proto_eigrp = proto_register_protocol( - "Enhanced Interior Gateway Routing Protocol", /* name */ - "EIGRP", /* short name */ - "eigrp" /* abbrev */ - ); + proto_eigrp = proto_register_protocol("Enhanced Interior Gateway Routing Protocol", "EIGRP", "eigrp"); register_dissector("eigrp", dissect_eigrp, proto_eigrp); /* Required function calls to register the header fields and subtrees used */ diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c index 5fa4661803..6b6ae84b30 100644 --- a/epan/dissectors/packet-elmi.c +++ b/epan/dissectors/packet-elmi.c @@ -509,8 +509,7 @@ proto_register_elmi(void) }; - proto_elmi = proto_register_protocol( - "Ethernet Local Management Interface", "E-LMI", "elmi"); + proto_elmi = proto_register_protocol("Ethernet Local Management Interface", "E-LMI", "elmi"); proto_register_field_array(proto_elmi, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index dd6336ab5d..d9e32e48b4 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -617,8 +617,7 @@ proto_register_exported_pdu(void) expert_module_t *expert_exported_pdu; /* Register the protocol name and description */ - proto_exported_pdu = proto_register_protocol("EXPORTED_PDU", - "exported_pdu", "exported_pdu"); + proto_exported_pdu = proto_register_protocol("EXPORTED_PDU", "exported_pdu", "exported_pdu"); expert_exported_pdu = expert_register_protocol(proto_exported_pdu); expert_register_field_array(expert_exported_pdu, ei, array_length(ei)); diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index eecf0e5163..91559a74ee 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -4019,8 +4019,7 @@ proto_register_f5ethtrailer(void) "This version of Wireshark does not understand how to decode this value", EXPFILL } }, }; - proto_f5ethtrailer = proto_register_protocol( - "F5 Ethernet Trailer Protocol", "F5 Ethernet trailer", "f5ethtrailer"); + proto_f5ethtrailer = proto_register_protocol("F5 Ethernet Trailer Protocol", "F5 Ethernet trailer", "f5ethtrailer"); expert_f5ethtrailer = expert_register_protocol(proto_f5ethtrailer); expert_register_field_array(expert_f5ethtrailer, ei, array_length(ei)); diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index 621504bb8f..5df55d2045 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -433,11 +433,7 @@ proto_register_flip(void) module_t *flip_module; - proto_flip = proto_register_protocol( - "NSN FLIP", /* name */ - "FLIP", /* short name */ - "flip" /* abbrev */ - ); + proto_flip = proto_register_protocol("NSN FLIP", "FLIP", "flip"); flip_handle = register_dissector("flip", dissect_flip, proto_flip); proto_register_field_array(proto_flip, hf, array_length(hf)); diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c index 99e8ac8e9e..2d6fdb0339 100644 --- a/epan/dissectors/packet-fmtp.c +++ b/epan/dissectors/packet-fmtp.c @@ -181,10 +181,7 @@ proto_register_fmtp(void) &ett_fmtp }; - proto_fmtp = proto_register_protocol( - "Flight Message Transfer Protocol (FMTP)", - "FMTP", - "fmtp"); + proto_fmtp = proto_register_protocol("Flight Message Transfer Protocol (FMTP)", "FMTP", "fmtp"); proto_register_field_array(proto_fmtp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-gcsna.c b/epan/dissectors/packet-gcsna.c index c2cd46f11e..e26830b8b0 100644 --- a/epan/dissectors/packet-gcsna.c +++ b/epan/dissectors/packet-gcsna.c @@ -431,11 +431,7 @@ proto_register_gcsna(void) expert_module_t* expert_gcsna; - proto_gcsna = proto_register_protocol( - "GCSNA", /* name */ - "GCSNA", /* short name */ - "gcsna" /* abbrev */ - ); + proto_gcsna = proto_register_protocol("GCSNA", "GCSNA", "gcsna"); gcsna_handle = register_dissector("gcsna", dissect_gcsna, proto_gcsna); diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index e598153b12..ac9d4f03ce 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -2042,9 +2042,7 @@ proto_register_gdsdb(void) "Invalid length", EXPFILL }}, }; - proto_gdsdb = proto_register_protocol( - "Firebird SQL Database Remote Protocol", - "FB/IB GDS DB", "gdsdb"); + proto_gdsdb = proto_register_protocol("Firebird SQL Database Remote Protocol", "FB/IB GDS DB", "gdsdb"); proto_register_field_array(proto_gdsdb, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-gluster_cli.c b/epan/dissectors/packet-gluster_cli.c index d2bdee2505..5323ba7e23 100644 --- a/epan/dissectors/packet-gluster_cli.c +++ b/epan/dissectors/packet-gluster_cli.c @@ -531,8 +531,7 @@ proto_register_gluster_cli(void) }; /* Register the protocol name and description */ - proto_gluster_cli = proto_register_protocol("Gluster CLI", - "Gluster CLI", "gluster.cli"); + proto_gluster_cli = proto_register_protocol("Gluster CLI", "Gluster CLI", "gluster.cli"); proto_register_subtree_array(ett, array_length(ett)); proto_register_field_array(proto_gluster_cli, hf, array_length(hf)); } diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index 1b01dd1267..1dde06dd9d 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -200,8 +200,7 @@ proto_register_gluster_pmap(void) &ett_gluster_pmap }; - proto_gluster_pmap = proto_register_protocol("Gluster Portmap", - "Gluster Portmap", "gluster.pmap"); + proto_gluster_pmap = proto_register_protocol("Gluster Portmap", "Gluster Portmap", "gluster.pmap"); proto_register_subtree_array(ett, array_length(ett)); proto_register_field_array(proto_gluster_pmap, hf, array_length(hf)); } diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index 6869889aff..f1b25630ba 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -370,10 +370,7 @@ proto_register_gsm_sms_ud(void) &ett_gsm_sms_ud_fragments, }; /* Register the protocol name and description */ - proto_gsm_sms_ud = proto_register_protocol( - "GSM Short Message Service User Data", /* Name */ - "GSM SMS UD", /* Short name */ - "gsm_sms_ud"); /* Filter name */ + proto_gsm_sms_ud = proto_register_protocol("GSM Short Message Service User Data", "GSM SMS UD", "gsm_sms_ud"); /* Required function calls to register header fields and subtrees used */ proto_register_field_array(proto_gsm_sms_ud, hf, array_length(hf)); diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index 0ecfa207b8..65390e60cb 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -620,9 +620,7 @@ proto_register_gssapi(void) module_t *gssapi_module; expert_module_t *expert_gssapi; - proto_gssapi = proto_register_protocol( - "GSS-API Generic Security Service Application Program Interface", - "GSS-API", "gss-api"); + proto_gssapi = proto_register_protocol("GSS-API Generic Security Service Application Program Interface", "GSS-API", "gss-api"); gssapi_module = prefs_register_protocol(proto_gssapi, NULL); prefs_register_bool_preference(gssapi_module, "gssapi_reassembly", diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index 1811769dce..c35e08b3ec 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.c @@ -122,8 +122,7 @@ proto_register_hci_h4(void) &ett_hci_h4, }; - proto_hci_h4 = proto_register_protocol("Bluetooth HCI H4", - "HCI_H4", "hci_h4"); + proto_hci_h4 = proto_register_protocol("Bluetooth HCI H4", "HCI_H4", "hci_h4"); hci_h4_handle = register_dissector("hci_h4", dissect_hci_h4, proto_hci_h4); diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c index cb8614c3fe..2b04890ad4 100644 --- a/epan/dissectors/packet-hdcp.c +++ b/epan/dissectors/packet-hdcp.c @@ -302,8 +302,7 @@ proto_register_hdcp(void) }; - proto_hdcp = proto_register_protocol( - "High bandwidth Digital Content Protection", "HDCP", "hdcp"); + proto_hdcp = proto_register_protocol("High bandwidth Digital Content Protection", "HDCP", "hdcp"); proto_register_field_array(proto_hdcp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c index 5a5184c30a..2905a26b69 100644 --- a/epan/dissectors/packet-hdcp2.c +++ b/epan/dissectors/packet-hdcp2.c @@ -372,9 +372,7 @@ proto_register_hdcp2(void) (gpointer)(&msg_info[i])); } - proto_hdcp2 = proto_register_protocol( - "High bandwidth Digital Content Protection version 2", - "HDCP2", "hdcp2"); + proto_hdcp2 = proto_register_protocol("High bandwidth Digital Content Protection version 2", "HDCP2", "hdcp2"); hdcp2_module = prefs_register_protocol_obsolete(proto_hdcp2); prefs_register_obsolete_preference(hdcp2_module, "enable"); diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c index e9f2698838..366e798ff8 100644 --- a/epan/dissectors/packet-hdmi.c +++ b/epan/dissectors/packet-hdmi.c @@ -242,8 +242,7 @@ proto_register_hdmi(void) &ett_hdmi_edid }; - proto_hdmi = proto_register_protocol( - "High-Definition Multimedia Interface", "HDMI", "hdmi"); + proto_hdmi = proto_register_protocol("High-Definition Multimedia Interface", "HDMI", "hdmi"); hdmi_handle = register_dissector("hdmi", dissect_hdmi, proto_hdmi ); proto_register_field_array(proto_hdmi, hf, array_length(hf)); diff --git a/epan/dissectors/packet-hicp.c b/epan/dissectors/packet-hicp.c index 4dff7d1e49..fc4387f157 100644 --- a/epan/dissectors/packet-hicp.c +++ b/epan/dissectors/packet-hicp.c @@ -382,10 +382,7 @@ proto_register_hicp(void) } }; - proto_hicp = proto_register_protocol( - "Host IP Configuration Protocol", - "HICP", - "hicp"); + proto_hicp = proto_register_protocol("Host IP Configuration Protocol", "HICP", "hicp"); proto_register_field_array(proto_hicp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c index 01212220b1..d018912cbb 100644 --- a/epan/dissectors/packet-hpext.c +++ b/epan/dissectors/packet-hpext.c @@ -100,8 +100,7 @@ proto_register_hpext(void) &ett_hpext }; - proto_hpext = proto_register_protocol( - "HP Extended Local-Link Control", "HPEXT", "hpext"); + proto_hpext = proto_register_protocol("HP Extended Local-Link Control", "HPEXT", "hpext"); proto_register_field_array(proto_hpext, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 8cd2dfc2f2..aba1fcd3ef 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -4730,11 +4730,7 @@ proto_register_message_http(void) &ett_message_http, }; - proto_message_http = proto_register_protocol( - "Media Type: message/http", - "message/http", - "message-http" - ); + proto_message_http = proto_register_protocol("Media Type: message/http", "message/http", "message-http"); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index 1ca1a5d22b..b1d5e2999f 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -296,9 +296,7 @@ proto_register_icap(void) &ett_icap, }; - proto_icap = proto_register_protocol( - "Internet Content Adaptation Protocol", - "ICAP", "icap"); + proto_icap = proto_register_protocol("Internet Content Adaptation Protocol", "ICAP", "icap"); proto_register_field_array(proto_icap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index d16a2b51a7..e64342edaf 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -1272,8 +1272,7 @@ void proto_register_icep(void) /* Register the protocol name and description */ proto_icep = - proto_register_protocol("Internet Communications Engine Protocol", - "ICEP", "icep"); + proto_register_protocol("Internet Communications Engine Protocol", "ICEP", "icep"); /* Required function calls to register the header fields and subtrees used */ diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index 580847b998..4eefad8a3f 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -1431,10 +1431,7 @@ void proto_register_1722_61883(void) expert_module_t* expert_1722_61883; /* Register the protocol name and description */ - proto_1722_61883 = proto_register_protocol( - "IEC 61883 Protocol", /* name */ - "IEC 61883", /* short name */ - "iec61883"); /* abbrev */ + proto_1722_61883 = proto_register_protocol("IEC 61883 Protocol", "IEC 61883", "iec61883"); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_1722_61883, hf, array_length(hf)); diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c index c37c87bff4..e26da6f3ec 100644 --- a/epan/dissectors/packet-ieee1905.c +++ b/epan/dissectors/packet-ieee1905.c @@ -11973,8 +11973,7 @@ proto_register_ieee1905(void) expert_module_t *expert_ieee1905 = NULL; - proto_ieee1905 = proto_register_protocol("IEEE 1905.1a", - "ieee1905", "ieee1905"); + proto_ieee1905 = proto_register_protocol("IEEE 1905.1a", "ieee1905", "ieee1905"); proto_register_field_array(proto_ieee1905, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index 4d2b0adffe..4b3abd5c17 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -291,9 +291,7 @@ proto_register_ipmi_session(void) static gint *ett[] = { &ett_ipmi_session, &ett_ipmi_session_payloadtype }; - proto_ipmi_session = proto_register_protocol( - "Intelligent Platform Management Interface (Session Wrapper)", "IPMI Session", - "ipmi_session"); + proto_ipmi_session = proto_register_protocol("Intelligent Platform Management Interface (Session Wrapper)", "IPMI Session", "ipmi_session"); proto_register_field_array(proto_ipmi_session, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index d25a2e2156..b5b3bf1d01 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -2533,12 +2533,10 @@ proto_register_ipsec(void) proto_ah = proto_register_protocol("Authentication Header", "AH", "ah"); proto_register_field_array(proto_ah, hf_ah, array_length(hf_ah)); - proto_esp = proto_register_protocol("Encapsulating Security Payload", - "ESP", "esp"); + proto_esp = proto_register_protocol("Encapsulating Security Payload", "ESP", "esp"); proto_register_field_array(proto_esp, hf_esp, array_length(hf_esp)); - proto_ipcomp = proto_register_protocol("IP Payload Compression", - "IPComp", "ipcomp"); + proto_ipcomp = proto_register_protocol("IP Payload Compression", "IPComp", "ipcomp"); proto_register_field_array(proto_ipcomp, hf_ipcomp, array_length(hf_ipcomp)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index e887bd6af0..32108849ce 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -1880,8 +1880,7 @@ proto_register_iso14443(void) expert_module_t* expert_iso14443; - proto_iso14443 = proto_register_protocol( - "ISO/IEC 14443", "ISO 14443", "iso14443"); + proto_iso14443 = proto_register_protocol("ISO/IEC 14443", "ISO 14443", "iso14443"); proto_register_field_array(proto_iso14443, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); expert_iso14443 = expert_register_protocol(proto_iso14443); diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c index 2361ad0519..7f071fc9d9 100644 --- a/epan/dissectors/packet-iso7816.c +++ b/epan/dissectors/packet-iso7816.c @@ -982,8 +982,7 @@ proto_register_iso7816(void) expert_module_t* expert_iso7816; - proto_iso7816 = proto_register_protocol( - "ISO/IEC 7816", "ISO 7816", "iso7816"); + proto_iso7816 = proto_register_protocol("ISO/IEC 7816", "ISO 7816", "iso7816"); proto_register_field_array(proto_iso7816, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); expert_iso7816 = expert_register_protocol(proto_iso7816); diff --git a/epan/dissectors/packet-isobus.c b/epan/dissectors/packet-isobus.c index 87a4f048a3..4c64737599 100644 --- a/epan/dissectors/packet-isobus.c +++ b/epan/dissectors/packet-isobus.c @@ -835,9 +835,7 @@ proto_register_isobus(void) register_init_routine(&isobus_init); register_cleanup_routine(&isobus_cleanup); - proto_isobus = proto_register_protocol("ISObus", - "ISOBUS", - "isobus"); + proto_isobus = proto_register_protocol("ISObus", "ISOBUS", "isobus"); proto_register_field_array(proto_isobus, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 799cddc4ae..3693335353 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -1193,10 +1193,7 @@ proto_register_iwarp_ddp_rdmap(void) module_t *iwarp_dep_rdmap_module; /* register the protocol name and description */ - proto_iwarp_ddp_rdmap = proto_register_protocol( - "iWARP Direct Data Placement and Remote Direct Memory Access Protocol", - "IWARP_DDP_RDMAP", - "iwarp_ddp_rdmap"); + proto_iwarp_ddp_rdmap = proto_register_protocol("iWARP Direct Data Placement and Remote Direct Memory Access Protocol", "IWARP_DDP_RDMAP", "iwarp_ddp_rdmap"); /* required function calls to register the header fields and subtrees */ proto_register_field_array(proto_iwarp_ddp_rdmap, hf, array_length(hf)); diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 875ff50340..7434cd0313 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -1066,9 +1066,7 @@ void proto_register_mpa(void) expert_module_t* expert_iwarp_mpa; /* register the protocol name and description */ - proto_iwarp_mpa = proto_register_protocol( - "iWARP Marker Protocol data unit Aligned framing", - "IWARP_MPA", "iwarp_mpa"); + proto_iwarp_mpa = proto_register_protocol("iWARP Marker Protocol data unit Aligned framing", "IWARP_MPA", "iwarp_mpa"); /* required function calls to register the header fields and subtrees */ proto_register_field_array(proto_iwarp_mpa, hf, array_length(hf)); diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index 45e83d05d3..4c3b523062 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -419,8 +419,7 @@ proto_register_krb4(void) &ett_krb4_auth_msg_type, }; - proto_krb4 = proto_register_protocol("Kerberos v4", - "KRB4", "krb4"); + proto_krb4 = proto_register_protocol("Kerberos v4", "KRB4", "krb4"); krb4_handle = register_dissector("krb4", dissect_krb4, proto_krb4); proto_register_field_array(proto_krb4, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 24b763bda4..338dc99ddb 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -291,8 +291,7 @@ proto_register_kpasswd(void) }; module_t *kpasswd_module; - proto_kpasswd = proto_register_protocol("MS Kpasswd", - "Kpasswd", "kpasswd"); + proto_kpasswd = proto_register_protocol("MS Kpasswd", "Kpasswd", "kpasswd"); proto_register_field_array(proto_kpasswd, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index 1a25fc9547..13e3752f4c 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -89,10 +89,7 @@ proto_register_l1_events(void) proto_register_subtree_array(ett, array_length(ett)); - proto_l1_events = proto_register_protocol( - "Layer 1 Event Messages", /* Long name */ - "Layer 1 Events", /* Short name */ - "data-l1-events"); /* Filter name */ + proto_l1_events = proto_register_protocol("Layer 1 Event Messages", "Layer 1 Events", "data-l1-events"); l1_events_handle = register_dissector("data-l1-events", dissect_l1_events, proto_l1_events); } diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 6f0236117d..f44deec32f 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -3710,8 +3710,7 @@ proto_register_l2tp(void) static decode_as_t l2tp_da = {"l2tp", "l2tp.pw_type", 1, 0, &l2tp_da_values, NULL, NULL, decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL}; - proto_l2tp = proto_register_protocol( - "Layer 2 Tunneling Protocol", "L2TP", "l2tp"); + proto_l2tp = proto_register_protocol("Layer 2 Tunneling Protocol", "L2TP", "l2tp"); l2tp_udp_handle = register_dissector("lt2p_udp", dissect_l2tp_udp, proto_l2tp); l2tp_ip_handle = register_dissector("l2tp_ip", dissect_l2tp_ip, proto_l2tp); atm_oam_llc_handle = register_dissector("atm_oam_llc", dissect_atm_oam_llc, proto_l2tp ); diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index a795f8ea59..5ed41f91c0 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -200,8 +200,7 @@ proto_register_laplink(void) module_t *laplink_module; /* Register the protocol name and description */ - proto_laplink = proto_register_protocol("Laplink", - "Laplink", "laplink"); + proto_laplink = proto_register_protocol("Laplink", "Laplink", "laplink"); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_laplink, hf, array_length(hf)); diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 8cb3cd675b..6e9217bd5c 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -5664,9 +5664,7 @@ void proto_register_ldap(void) { prefs_register_obsolete_preference(ldap_module, "max_pdu"); - proto_cldap = proto_register_protocol( - "Connectionless Lightweight Directory Access Protocol", - "CLDAP", "cldap"); + proto_cldap = proto_register_protocol("Connectionless Lightweight Directory Access Protocol", "CLDAP", "cldap"); cldap_handle = register_dissector("cldap", dissect_mscldap, proto_cldap); ldap_tap=register_tap("ldap"); diff --git a/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c index b715156baa..5126b65e4a 100644 --- a/epan/dissectors/packet-moldudp64.c +++ b/epan/dissectors/packet-moldudp64.c @@ -247,8 +247,7 @@ proto_register_moldudp64(void) expert_module_t* expert_moldudp64; /* Register the protocol name and description */ - proto_moldudp64 = proto_register_protocol("MoldUDP64", - "MoldUDP64", "moldudp64"); + proto_moldudp64 = proto_register_protocol("MoldUDP64", "MoldUDP64", "moldudp64"); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_moldudp64, hf, array_length(hf)); diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index a62ba084ba..6a8f87b8f5 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -684,8 +684,7 @@ proto_register_mpeg_audio(void) &ett_mpeg_audio_ID3v1, }; - proto_mpeg_audio = proto_register_protocol( - "Moving Picture Experts Group Audio", "MPEG Audio", "mpeg-audio"); + proto_mpeg_audio = proto_register_protocol("Moving Picture Experts Group Audio", "MPEG Audio", "mpeg-audio"); proto_register_field_array(proto_mpeg_audio, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 6c63f2e4c6..5db34f6399 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -1358,13 +1358,11 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_trick_mode }; - proto_mpeg = proto_register_protocol( - "Moving Picture Experts Group", "MPEG", "mpeg"); + proto_mpeg = proto_register_protocol("Moving Picture Experts Group", "MPEG", "mpeg"); mpeg_handle = register_dissector("mpeg", dissect_mpeg, proto_mpeg); heur_subdissector_list = register_heur_dissector_list("mpeg", proto_mpeg); - proto_mpeg_pes = proto_register_protocol( - "Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); + proto_mpeg_pes = proto_register_protocol("Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); proto_register_field_array(proto_mpeg_pes, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes); diff --git a/epan/dissectors/packet-mpls-mac.c b/epan/dissectors/packet-mpls-mac.c index 1454bb9ae8..7bb27724eb 100644 --- a/epan/dissectors/packet-mpls-mac.c +++ b/epan/dissectors/packet-mpls-mac.c @@ -218,9 +218,7 @@ proto_register_mpls_mac(void) }; proto_mpls_mac = - proto_register_protocol("MPLS-MAC", - "Media Access Control (MAC) Address Withdrawal over Static Pseudowire", - "mpls_mac"); + proto_register_protocol("Media Access Control (MAC) Address Withdrawal over Static Pseudowire", "MPLS-MAC", "mpls_mac"); proto_register_field_array(proto_mpls_mac, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 32087d42d5..bd96efd9b9 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -657,14 +657,10 @@ proto_register_mpls(void) expert_module_t* expert_mpls; module_t * module_mpls; - proto_mpls = proto_register_protocol("MultiProtocol Label Switching Header", - "MPLS", "mpls"); - proto_pw_ach = proto_register_protocol(PW_ACH, - "PW Associated Channel", "pwach"); - proto_pw_mcw = proto_register_protocol("PW MPLS Control Word (generic/preferred)", - "Generic PW (with CW)", "pwmcw"); - proto_pw_ach_mcc = proto_register_protocol("Management Communication Channel (MCC)", - "PW Associated Management Communication Channel", "mcc"); + proto_mpls = proto_register_protocol("MultiProtocol Label Switching Header", "MPLS", "mpls"); + proto_pw_ach = proto_register_protocol(PW_ACH, "PW Associated Channel", "pwach"); + proto_pw_mcw = proto_register_protocol("PW MPLS Control Word (generic/preferred)", "Generic PW (with CW)", "pwmcw"); + proto_pw_ach_mcc = proto_register_protocol("Management Communication Channel (MCC)", "PW Associated Management Communication Channel", "mcc"); proto_register_field_array(proto_mpls, mplsf_info, array_length(mplsf_info)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-ms-do.c b/epan/dissectors/packet-ms-do.c index 02ba11643f..d30905ca2a 100644 --- a/epan/dissectors/packet-ms-do.c +++ b/epan/dissectors/packet-ms-do.c @@ -734,11 +734,7 @@ proto_register_do(void) expert_module_t* expert_do = NULL; - proto_do = proto_register_protocol( - "Microsoft Delivery Optimization", - "MS-DO", - "msdo" - ); + proto_do = proto_register_protocol("Microsoft Delivery Optimization", "MS-DO", "msdo"); proto_register_field_array(proto_do, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-msrcp.c b/epan/dissectors/packet-msrcp.c index 18caf0cca3..3b5b58e480 100644 --- a/epan/dissectors/packet-msrcp.c +++ b/epan/dissectors/packet-msrcp.c @@ -354,12 +354,7 @@ proto_register_msrcp(void) } }; - proto_msrcp = proto_register_protocol( - "MSRCP Protocol", - "MSRCP", - "msrcp" - ); - + proto_msrcp = proto_register_protocol("MSRCP Protocol", "MSRCP", "msrcp"); proto_register_field_array(proto_msrcp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index 3db6f2fda4..93150f40ce 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -542,8 +542,7 @@ proto_register_mstp(void) expert_module_t* expert_mstp; - proto_mstp = proto_register_protocol("BACnet MS/TP", - "BACnet MS/TP", "mstp"); + proto_mstp = proto_register_protocol("BACnet MS/TP", "BACnet MS/TP", "mstp"); proto_register_field_array(proto_mstp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 4eee0a7b2b..135beda09d 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -1060,10 +1060,7 @@ proto_register_multipart(void) /* * Register the protocol name and description */ - proto_multipart = proto_register_protocol( - "MIME Multipart Media Encapsulation", - "MIME multipart", - "mime_multipart"); + proto_multipart = proto_register_protocol("MIME Multipart Media Encapsulation", "MIME multipart", "mime_multipart"); /* * Required function calls to register diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index 9da7041676..0c78d88a36 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -1812,8 +1812,7 @@ proto_register_nis(void) &ett_nisplus_log_entry, }; - proto_nisplus = proto_register_protocol("NIS+", - "NIS+", "nisplus"); + proto_nisplus = proto_register_protocol("NIS+", "NIS+", "nisplus"); proto_register_field_array(proto_nisplus, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-nwp.c b/epan/dissectors/packet-nwp.c index 789d8d1f83..89b8ae528b 100644 --- a/epan/dissectors/packet-nwp.c +++ b/epan/dissectors/packet-nwp.c @@ -329,10 +329,7 @@ proto_register_nwp(void) expert_module_t *expert_nwp; - proto_nwp = proto_register_protocol( - "Neighborhood Watch Protocol", - "NWP", - "nwp"); + proto_nwp = proto_register_protocol("Neighborhood Watch Protocol", "NWP", "nwp"); nwp_handle = register_dissector("nwp", dissect_nwp, proto_nwp); proto_register_field_array(proto_nwp, hf, array_length(hf)); diff --git a/epan/dissectors/packet-oipf.c b/epan/dissectors/packet-oipf.c index e2976b53c9..30c3545ca2 100644 --- a/epan/dissectors/packet-oipf.c +++ b/epan/dissectors/packet-oipf.c @@ -145,8 +145,7 @@ proto_register_oipf(void) NULL, 0, NULL, HFILL } } }; - proto_oipf_ciplus = proto_register_protocol( - "Open IPTV Forum CSPG-CI+", "OIPF CI+", "oipf.ciplus"); + proto_oipf_ciplus = proto_register_protocol("Open IPTV Forum CSPG-CI+", "OIPF CI+", "oipf.ciplus"); proto_register_field_array(proto_oipf_ciplus, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-opa-fe.c b/epan/dissectors/packet-opa-fe.c index 402c9c8edf..584a7ebdb8 100644 --- a/epan/dissectors/packet-opa-fe.c +++ b/epan/dissectors/packet-opa-fe.c @@ -129,9 +129,7 @@ void proto_register_opa_fe(void) &ett_fe }; - proto_opa_fe = proto_register_protocol( - "Intel Omni-Path FE Header - Omni-Path Fabric Executive Header", - "OPA FE", "opa.fe"); + proto_opa_fe = proto_register_protocol("Intel Omni-Path FE Header - Omni-Path Fabric Executive Header", "OPA FE", "opa.fe"); opa_fe_handle = register_dissector("opa.fe", dissect_opa_fe, proto_opa_fe); proto_register_field_array(proto_opa_fe, hf, array_length(hf)); diff --git a/epan/dissectors/packet-opa-snc.c b/epan/dissectors/packet-opa-snc.c index ca19f19d50..9ca2fdb281 100644 --- a/epan/dissectors/packet-opa-snc.c +++ b/epan/dissectors/packet-opa-snc.c @@ -385,9 +385,7 @@ void proto_register_opa_snc(void) } }; - proto_opa_snc = proto_register_protocol( - "Intel Omni-Path SnC - Omni-Path Snoop and Capture MetaData Header", - "OPA SnC", "opa.snc"); + proto_opa_snc = proto_register_protocol("Intel Omni-Path SnC - Omni-Path Snoop and Capture MetaData Header", "OPA SnC", "opa.snc"); opa_snc_handle = register_dissector("opa.snc", dissect_opa_snc, proto_opa_snc); proto_register_field_array(proto_opa_snc, hf, array_length(hf)); diff --git a/epan/dissectors/packet-openflow.c b/epan/dissectors/packet-openflow.c index 8679a78d72..8b21ed55df 100644 --- a/epan/dissectors/packet-openflow.c +++ b/epan/dissectors/packet-openflow.c @@ -157,8 +157,7 @@ proto_register_openflow(void) expert_module_t* expert_openflow; /* Register the protocol name and description */ - proto_openflow = proto_register_protocol("OpenFlow", - "OpenFlow", "openflow"); + proto_openflow = proto_register_protocol("OpenFlow", "OpenFlow", "openflow"); openflow_handle = register_dissector("openflow", dissect_openflow, proto_openflow); diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c index 5ef24e8fc8..cceb7abe8c 100644 --- a/epan/dissectors/packet-openflow_v1.c +++ b/epan/dissectors/packet-openflow_v1.c @@ -1558,8 +1558,7 @@ proto_register_openflow_v1(void) expert_module_t* expert_openflow_v1; /* Register the protocol name and description */ - proto_openflow_v1 = proto_register_protocol("OpenFlow 1.0", - "openflow_v1", "openflow_v1"); + proto_openflow_v1 = proto_register_protocol("OpenFlow 1.0", "openflow_v1", "openflow_v1"); register_dissector("openflow_v1", dissect_openflow_v1, proto_openflow_v1); diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index 5bbdfd5bfc..a4c47044dd 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -7453,8 +7453,7 @@ proto_register_openflow_v4(void) expert_module_t *expert_openflow_v4; /* Register the protocol name and description */ - proto_openflow_v4 = proto_register_protocol("OpenFlow 1.3", - "openflow_v4", "openflow_v4"); + proto_openflow_v4 = proto_register_protocol("OpenFlow 1.3", "openflow_v4", "openflow_v4"); register_dissector("openflow_v4", dissect_openflow_v4, proto_openflow_v4); diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index 5a959220a6..ffe2f56bcb 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -9791,8 +9791,7 @@ proto_register_openflow_v5(void) expert_module_t *expert_openflow_v5; /* Register the protocol name and description */ - proto_openflow_v5 = proto_register_protocol("OpenFlow 1.4", - "openflow_v5", "openflow_v5"); + proto_openflow_v5 = proto_register_protocol("OpenFlow 1.4", "openflow_v5", "openflow_v5"); register_dissector("openflow_v5", dissect_openflow_v5, proto_openflow_v5); diff --git a/epan/dissectors/packet-openflow_v6.c b/epan/dissectors/packet-openflow_v6.c index ae016a33eb..12e2be1407 100644 --- a/epan/dissectors/packet-openflow_v6.c +++ b/epan/dissectors/packet-openflow_v6.c @@ -10712,8 +10712,7 @@ proto_register_openflow_v6(void) expert_module_t *expert_openflow_v6; /* Register the protocol name and description */ - proto_openflow_v6 = proto_register_protocol("OpenFlow 1.5", - "openflow_v6", "openflow_v6"); + proto_openflow_v6 = proto_register_protocol("OpenFlow 1.5", "openflow_v6", "openflow_v6"); register_dissector("openflow_v6", dissect_openflow_v6, proto_openflow_v6); diff --git a/epan/dissectors/packet-pcapng_block.c b/epan/dissectors/packet-pcapng_block.c index 424d54314c..34212b6f56 100644 --- a/epan/dissectors/packet-pcapng_block.c +++ b/epan/dissectors/packet-pcapng_block.c @@ -46,8 +46,7 @@ dissect_pcapng_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* void proto_register_pcapng_block(void) { - proto_pcapng_block = proto_register_protocol("Pcapng block", - "PCAPNG", "pcapng"); + proto_pcapng_block = proto_register_protocol("Pcapng block", "PCAPNG", "pcapng"); pcapng_block_type_dissector_table = register_dissector_table("pcapng.block_type", "pcapng block type", proto_pcapng_block, FT_UINT32, BASE_DEC); diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c index 1dafb86d38..7bb2b41663 100644 --- a/epan/dissectors/packet-pcnfsd.c +++ b/epan/dissectors/packet-pcnfsd.c @@ -403,8 +403,7 @@ proto_register_pcnfsd(void) &ett_pcnfsd_gids }; - proto_pcnfsd = proto_register_protocol("PC NFS", - "PCNFSD", "pcnfsd"); + proto_pcnfsd = proto_register_protocol("PC NFS", "PCNFSD", "pcnfsd"); proto_register_field_array(proto_pcnfsd, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c index c651fb977f..beecd95fb9 100644 --- a/epan/dissectors/packet-peekremote.c +++ b/epan/dissectors/packet-peekremote.c @@ -799,8 +799,7 @@ proto_register_peekremote(void) }; expert_module_t *expert_peekremote; - proto_peekremote = proto_register_protocol( - "AiroPeek/OmniPeek encapsulated IEEE 802.11", "PEEKREMOTE", "peekremote"); + proto_peekremote = proto_register_protocol("AiroPeek/OmniPeek encapsulated IEEE 802.11", "PEEKREMOTE", "peekremote"); proto_register_field_array(proto_peekremote, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); expert_peekremote = expert_register_protocol(proto_peekremote); diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index fafb7f090e..5d9f95714f 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -523,8 +523,7 @@ proto_register_pflog(void) expert_module_t* expert_pflog; module_t *pflog_module; - proto_pflog = proto_register_protocol("OpenBSD Packet Filter log file", - "PFLOG", "pflog"); + proto_pflog = proto_register_protocol("OpenBSD Packet Filter log file", "PFLOG", "pflog"); proto_register_field_array(proto_pflog, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); expert_pflog = expert_register_protocol(proto_pflog); @@ -646,9 +645,7 @@ proto_register_old_pflog(void) }; static gint *ett[] = { &ett_old_pflog }; - proto_old_pflog = proto_register_protocol( - "OpenBSD Packet Filter log file, pre 3.4", - "PFLOG-OLD", "pflog-old"); + proto_old_pflog = proto_register_protocol("OpenBSD Packet Filter log file, pre 3.4", "PFLOG-OLD", "pflog-old"); proto_register_field_array(proto_old_pflog, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 53e73d78c8..ac104d26f7 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -6153,8 +6153,7 @@ proto_register_ppp_raw_hdlc(void) &ett_ppp_hdlc_data }; - proto_ppp_hdlc = proto_register_protocol("PPP In HDLC-Like Framing", - "PPP-HDLC", "ppp_hdlc"); + proto_ppp_hdlc = proto_register_protocol("PPP In HDLC-Like Framing", "PPP-HDLC", "ppp_hdlc"); ppp_raw_hdlc_handle = register_dissector("ppp_raw_hdlc", dissect_ppp_raw_hdlc, proto_ppp_hdlc); proto_register_subtree_array(ett, array_length(ett)); proto_register_field_array(proto_ppp_hdlc, hf, array_length(hf)); @@ -8021,8 +8020,7 @@ proto_register_chap(void) NULL, HFILL }}, }; - proto_chap = proto_register_protocol( - "PPP Challenge Handshake Authentication Protocol", "PPP CHAP", "chap"); + proto_chap = proto_register_protocol("PPP Challenge Handshake Authentication Protocol", "PPP CHAP", "chap"); chap_handle = register_dissector("chap", dissect_chap, proto_chap); proto_register_field_array(proto_chap, hf, array_length(hf)); diff --git a/epan/dissectors/packet-q708.c b/epan/dissectors/packet-q708.c index 9f3088732c..b0d0037bb0 100644 --- a/epan/dissectors/packet-q708.c +++ b/epan/dissectors/packet-q708.c @@ -14148,10 +14148,7 @@ proto_register_q708(void) /* * Register the protocol name and description */ - proto_q708 = proto_register_protocol( - "ITU-T Q.708 ISPC Analysis", - "Q.708", - "q708"); + proto_q708 = proto_register_protocol("ITU-T Q.708 ISPC Analysis", "Q.708", "q708"); /* * Required function calls to register diff --git a/epan/dissectors/packet-rftap.c b/epan/dissectors/packet-rftap.c index a755dce0fd..ba50665abe 100644 --- a/epan/dissectors/packet-rftap.c +++ b/epan/dissectors/packet-rftap.c @@ -551,10 +551,7 @@ proto_register_rftap(void) }; /* Register the protocol name and description */ - proto_rftap = proto_register_protocol( - "RFtap Protocol", /* name */ - "RFtap", /* short_name */ - "rftap"); /* filter_name (used for display filter string) */ + proto_rftap = proto_register_protocol("RFtap Protocol", "RFtap", "rftap"); /* Register the header fields and subtrees */ proto_register_field_array(proto_rftap, hf, array_length(hf)); diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c index dd10691b29..6d2abcbbe3 100644 --- a/epan/dissectors/packet-rmcp.c +++ b/epan/dissectors/packet-rmcp.c @@ -207,8 +207,7 @@ proto_register_rmcp(void) &ett_rmcp_typeclass }; - proto_rmcp = proto_register_protocol( - "Remote Management Control Protocol", "RMCP", "rmcp"); + proto_rmcp = proto_register_protocol("Remote Management Control Protocol", "RMCP", "rmcp"); proto_register_field_array(proto_rmcp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -236,8 +235,7 @@ proto_register_rsp(void) &ett_rsp }; - proto_rsp = proto_register_protocol( - "RMCP Security-extensions Protocol", "RSP", "rsp"); + proto_rsp = proto_register_protocol("RMCP Security-extensions Protocol", "RSP", "rsp"); proto_register_field_array(proto_rsp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index b0010f53e0..a178018733 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -227,8 +227,7 @@ proto_register_rmp(void) &ett_rmp, }; - proto_rmp = proto_register_protocol( - "HP Remote Maintenance Protocol", "RMP", "rmp"); + proto_rmp = proto_register_protocol("HP Remote Maintenance Protocol", "RMP", "rmp"); proto_register_field_array(proto_rmp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c index c875ce30b0..386e7f125f 100644 --- a/epan/dissectors/packet-rquota.c +++ b/epan/dissectors/packet-rquota.c @@ -284,8 +284,7 @@ proto_register_rquota(void) &ett_rquota_rquota, }; - proto_rquota = proto_register_protocol("Remote Quota", - "RQUOTA", "rquota"); + proto_rquota = proto_register_protocol("Remote Quota", "RQUOTA", "rquota"); proto_register_field_array(proto_rquota, hf, array_length(hf)); diff --git a/epan/dissectors/packet-rtps-processed.c b/epan/dissectors/packet-rtps-processed.c index 1d4ea218f1..781f624415 100644 --- a/epan/dissectors/packet-rtps-processed.c +++ b/epan/dissectors/packet-rtps-processed.c @@ -420,10 +420,7 @@ proto_register_rtps_processed(void) }; /* Register the protocol name and description */ - rtpsproc_tree = proto_register_protocol( - "Real-Time Publish-Subscribe Wire Protocol (processed)", - "RTPS-PROC", - "rtpsproc"); + rtpsproc_tree = proto_register_protocol("Real-Time Publish-Subscribe Wire Protocol (processed)", "RTPS-PROC", "rtpsproc"); /* Required function calls to register the header fields and subtrees */ rtpsproc_hf = proto_registrar_get_nth(rtpsproc_tree); diff --git a/epan/dissectors/packet-rtps-virtual-transport.c b/epan/dissectors/packet-rtps-virtual-transport.c index 521e961b20..f30f951b7d 100644 --- a/epan/dissectors/packet-rtps-virtual-transport.c +++ b/epan/dissectors/packet-rtps-virtual-transport.c @@ -1169,10 +1169,7 @@ proto_register_rtps_virtual_transport(void) }; /* Register the protocol name and description */ - proto_rtpsvt = proto_register_protocol( - "Real-Time Publish-Subscribe Virtual Transport", - "RTPS-VT", - "rtpsvt"); + proto_rtpsvt = proto_register_protocol("Real-Time Publish-Subscribe Virtual Transport", "RTPS-VT", "rtpsvt"); /* Required function calls to register the header fields and subtrees */ rtpsvt_hf = proto_registrar_get_nth(proto_rtpsvt); diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index b6aa3948af..96ad129a20 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -17169,10 +17169,7 @@ void proto_register_rtps(void) { module_t *rtps_module; expert_module_t *expert_rtps; - proto_rtps = proto_register_protocol( - "Real-Time Publish-Subscribe Wire Protocol", - "RTPS", - "rtps"); + proto_rtps = proto_register_protocol("Real-Time Publish-Subscribe Wire Protocol", "RTPS", "rtps"); proto_register_field_array(proto_rtps, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); expert_rtps = expert_register_protocol(proto_rtps); diff --git a/epan/dissectors/packet-s101.c b/epan/dissectors/packet-s101.c index 0c6aafeec6..bb0772c26b 100644 --- a/epan/dissectors/packet-s101.c +++ b/epan/dissectors/packet-s101.c @@ -624,8 +624,7 @@ proto_register_S101(void) }; /* Register the protocol name and description */ - proto_S101 = proto_register_protocol("S101", - "S101", "s101"); + proto_S101 = proto_register_protocol("S101", "S101", "s101"); /* Required function calls to register the header fields and subtrees */ proto_register_field_array(proto_S101, hf, array_length(hf)); diff --git a/epan/dissectors/packet-sbas_l1.c b/epan/dissectors/packet-sbas_l1.c index 7dcee2da46..e60ada358d 100644 --- a/epan/dissectors/packet-sbas_l1.c +++ b/epan/dissectors/packet-sbas_l1.c @@ -1232,10 +1232,7 @@ void proto_register_sbas_l1(void) { &ett_sbas_l1_mt25, }; - proto_sbas_l1 = proto_register_protocol( - "SBAS L1 Navigation Message", - "SBAS L1", - "sbas_l1"); + proto_sbas_l1 = proto_register_protocol("SBAS L1 Navigation Message", "SBAS L1", "sbas_l1"); proto_register_field_array(proto_sbas_l1, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-scte35.c b/epan/dissectors/packet-scte35.c index 3083d1b4fe..10e11cbdb9 100644 --- a/epan/dissectors/packet-scte35.c +++ b/epan/dissectors/packet-scte35.c @@ -1475,11 +1475,7 @@ proto_register_scte35(void) }; /* Allocate a protocol number. */ - proto_scte35 = proto_register_protocol( - "SCTE-35 Splice Information", /* name */ - "SCTE 35", /* short name */ - "scte35" /* abbreviation */ - ); + proto_scte35 = proto_register_protocol("SCTE-35 Splice Information", "SCTE 35", "scte35"); scte35_handle = register_dissector("scte35", dissect_scte35_splice_info, proto_scte35); /* Register groups and fields. */ diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index 0fca3fb9f0..78a571a6c4 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -180,8 +180,7 @@ proto_register_sdlc(void) &ett_sdlc_control, }; - proto_sdlc = proto_register_protocol( - "Synchronous Data Link Control (SDLC)", "SDLC", "sdlc"); + proto_sdlc = proto_register_protocol("Synchronous Data Link Control (SDLC)", "SDLC", "sdlc"); proto_register_field_array(proto_sdlc, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-shicp.c b/epan/dissectors/packet-shicp.c index 80b9640fba..43e9a5ae61 100644 --- a/epan/dissectors/packet-shicp.c +++ b/epan/dissectors/packet-shicp.c @@ -605,10 +605,7 @@ proto_register_shicp(void) } }; - proto_shicp = proto_register_protocol( - "Secure Host IP Configuration Protocol", - "SHICP", - "shicp"); + proto_shicp = proto_register_protocol("Secure Host IP Configuration Protocol", "SHICP", "shicp"); proto_register_field_array(proto_shicp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 906ab76155..01ff63c46c 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -1133,8 +1133,7 @@ proto_register_smb_logon( void) &ett_smb_db_info }; - proto_smb_logon = proto_register_protocol( - "Microsoft Windows Logon Protocol (Old)", "SMB_NETLOGON", "smb_netlogon"); + proto_smb_logon = proto_register_protocol("Microsoft Windows Logon Protocol (Old)", "SMB_NETLOGON", "smb_netlogon"); proto_register_field_array(proto_smb_logon, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index c4d8d712fb..d1841101bf 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -229,8 +229,7 @@ proto_register_smb_mailslot(void) &ett_smb_msp }; - proto_smb_msp = proto_register_protocol( - "SMB MailSlot Protocol", "SMB Mailslot", "mailslot"); + proto_smb_msp = proto_register_protocol("SMB MailSlot Protocol", "SMB Mailslot", "mailslot"); proto_register_field_array(proto_smb_msp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 701d92313a..12b5836ceb 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -3220,8 +3220,7 @@ proto_register_pipe_lanman(void) &ett_lanman_share, }; - proto_smb_lanman = proto_register_protocol( - "Microsoft Windows Lanman Remote API Protocol", "LANMAN", "lanman"); + proto_smb_lanman = proto_register_protocol("Microsoft Windows Lanman Remote API Protocol", "LANMAN", "lanman"); proto_register_field_array(proto_smb_lanman, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 9849a3dd56..cdf6bfdbeb 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -3453,8 +3453,7 @@ proto_register_sna(void) proto_register_subtree_array(ett, array_length(ett)); sna_handle = register_dissector("sna", dissect_sna, proto_sna); - proto_sna_xid = proto_register_protocol( - "Systems Network Architecture XID", "SNA XID", "sna_xid"); + proto_sna_xid = proto_register_protocol("Systems Network Architecture XID", "SNA XID", "sna_xid"); sna_xid_handle = register_dissector("sna_xid", dissect_sna_xid, proto_sna_xid); sna_address_type = address_type_dissector_register("AT_SNA", "SNA Address", sna_fid_to_str_buf, sna_address_str_len, NULL, NULL, NULL, NULL, NULL); diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 592be5b6f5..3d8d4e09c3 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -24,9 +24,9 @@ #include <wsutil/utf8_entities.h> -#define PROTOCOL_NAME "IEEE C37.118 Synchrophasor Protocol" -#define PROTOCOL_SHORT_NAME "SYNCHROPHASOR" -#define PROTOCOL_ABBREV "synphasor" +#define PNAME "IEEE C37.118 Synchrophasor Protocol" +#define PSNAME "SYNCHROPHASOR" +#define PFNAME "synphasor" /* forward references */ void proto_register_synphasor(void); @@ -1850,7 +1850,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v return 0; /* write the protocol name to the info column */ - col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTOCOL_SHORT_NAME); + col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); frame_type = tvb_get_guint8(tvb, 1) >> 4; @@ -2341,9 +2341,7 @@ void proto_register_synphasor(void) expert_module_t* expert_synphasor; /* register protocol */ - proto_synphasor = proto_register_protocol(PROTOCOL_NAME, - PROTOCOL_SHORT_NAME, - PROTOCOL_ABBREV); + proto_synphasor = proto_register_protocol(PNAME, PSNAME, PFNAME); /* Registering protocol to be called by another dissector */ synphasor_udp_handle = register_dissector("synphasor", dissect_udp, proto_synphasor); diff --git a/epan/dissectors/packet-sysdig-event.c b/epan/dissectors/packet-sysdig-event.c index c42e7f20a1..c0fdc7e3e4 100644 --- a/epan/dissectors/packet-sysdig-event.c +++ b/epan/dissectors/packet-sysdig-event.c @@ -3220,8 +3220,7 @@ proto_register_sysdig_event(void) }; /* Register the protocol name and description */ - proto_sysdig_event = proto_register_protocol("Sysdig Event", - "Sysdig Event", "sysdig"); + proto_sysdig_event = proto_register_protocol("Sysdig Event", "Sysdig Event", "sysdig"); /* Required function calls to register the header fields and subtrees */ proto_register_field_array(proto_sysdig_event, hf, array_length(hf)); diff --git a/epan/dissectors/packet-tcpcl.c b/epan/dissectors/packet-tcpcl.c index 90aa722080..7d9e35dd86 100644 --- a/epan/dissectors/packet-tcpcl.c +++ b/epan/dissectors/packet-tcpcl.c @@ -2168,11 +2168,7 @@ proto_register_tcpclv3(void) { expert_module_t *expert_tcpcl; - proto_tcpcl = proto_register_protocol( - "DTN TCP Convergence Layer Protocol", - "TCPCL", - "tcpcl" - ); + proto_tcpcl = proto_register_protocol("DTN TCP Convergence Layer Protocol", "TCPCL", "tcpcl"); proto_tcpcl_exts = proto_register_protocol_in_name_only( "TCPCL Extension Subdissectors", diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index 977788823b..3176e65ccd 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -367,8 +367,7 @@ proto_register_teredo(void) module_t *teredo_module; - proto_teredo = proto_register_protocol( - "Teredo IPv6 over UDP tunneling", "Teredo", "teredo"); + proto_teredo = proto_register_protocol("Teredo IPv6 over UDP tunneling", "Teredo", "teredo"); proto_register_field_array(proto_teredo, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); teredo_handle = register_dissector("teredo", dissect_teredo, proto_teredo); diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c index b1fe0bacd7..1a40eb998f 100644 --- a/epan/dissectors/packet-text-media.c +++ b/epan/dissectors/packet-text-media.c @@ -134,10 +134,7 @@ proto_register_text_lines(void) proto_register_subtree_array(ett, array_length(ett)); - proto_text_lines = proto_register_protocol( - "Line-based text data", /* Long name */ - "Line-based text data", /* Short name */ - "data-text-lines"); /* Filter name */ + proto_text_lines = proto_register_protocol("Line-based text data", "Line-based text data", "data-text-lines"); register_dissector("data-text-lines", dissect_text_lines, proto_text_lines); } diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 82efb4f4eb..d25decb06a 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -1637,8 +1637,7 @@ void proto_register_tns(void) }; module_t *tns_module; - proto_tns = proto_register_protocol( - "Transparent Network Substrate Protocol", "TNS", "tns"); + proto_tns = proto_register_protocol("Transparent Network Substrate Protocol", "TNS", "tns"); proto_register_field_array(proto_tns, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); tns_handle = register_dissector("tns", dissect_tns, proto_tns); diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index 1e169c72e0..e575343963 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -186,8 +186,7 @@ proto_register_turnchannel(void) }; /* Register the protocol name and description */ - proto_turnchannel = proto_register_protocol("TURN Channel", - "TURNCHANNEL", "turnchannel"); + proto_turnchannel = proto_register_protocol("TURN Channel", "TURNCHANNEL", "turnchannel"); turnchannel_tcp_handle = register_dissector("turnchannel-tcp", dissect_turnchannel_tcp, proto_turnchannel); turnchannel_udp_handle = register_dissector("turnchannel", dissect_turnchannel_message, proto_turnchannel); diff --git a/epan/dissectors/packet-twamp.c b/epan/dissectors/packet-twamp.c index 8e5b482036..1f0f7de019 100644 --- a/epan/dissectors/packet-twamp.c +++ b/epan/dissectors/packet-twamp.c @@ -818,10 +818,7 @@ void proto_register_twamp(void) /* Register the protocol */ - proto_twamp_test = proto_register_protocol( - "TwoWay Active Measurement Test Protocol", - "TWAMP-Test", - "twamp.test"); + proto_twamp_test = proto_register_protocol("TwoWay Active Measurement Test Protocol", "TWAMP-Test", "twamp.test"); /* Register the field array */ proto_register_field_array (proto_twamp_test, hf_twamp_test, @@ -835,10 +832,7 @@ void proto_register_twamp(void) twamp_test_handle = register_dissector("twamp.test", dissect_twamp_test, proto_twamp_test); /* Register the protocol */ - proto_twamp_control = proto_register_protocol( - "TwoWay Active Measurement Control Protocol", - "TWAMP-Control", - "twamp.control"); + proto_twamp_control = proto_register_protocol("TwoWay Active Measurement Control Protocol", "TWAMP-Control", "twamp.control"); /* Register the field array */ proto_register_field_array (proto_twamp_control, hf_twamp_control, @@ -852,10 +846,7 @@ void proto_register_twamp(void) twamp_control_handle = register_dissector("twamp.control", dissect_twamp_server_greeting, proto_twamp_control); /* Register the protocol */ - proto_owamp_test = proto_register_protocol( - "One-way Active Measurement Protocol", - "OWAMP-Test", - "owamp.test"); + proto_owamp_test = proto_register_protocol("One-way Active Measurement Protocol", "OWAMP-Test", "owamp.test"); /* Register the dissector handle */ owamp_test_handle = register_dissector("owamp.test", dissect_owamp_test, proto_owamp_test); diff --git a/epan/dissectors/packet-ubx-gps_l1_lnav.c b/epan/dissectors/packet-ubx-gps_l1_lnav.c index 4af1063385..0758175e08 100644 --- a/epan/dissectors/packet-ubx-gps_l1_lnav.c +++ b/epan/dissectors/packet-ubx-gps_l1_lnav.c @@ -380,10 +380,7 @@ void proto_register_ubx_gps_l1(void) { &ett_ubx_gps_l1_sf1_w10, }; - proto_ubx_gps_l1 = proto_register_protocol( - "GPS L1 Navigation Message", - "GPS L1", - "gps_l1"); + proto_ubx_gps_l1 = proto_register_protocol("GPS L1 Navigation Message", "GPS L1", "gps_l1"); register_dissector("ubx_gps_l1", dissect_ubx_gps_l1, proto_ubx_gps_l1); diff --git a/epan/dissectors/packet-usb-i1d3.c b/epan/dissectors/packet-usb-i1d3.c index 66f0b5cc98..652690ff3e 100644 --- a/epan/dissectors/packet-usb-i1d3.c +++ b/epan/dissectors/packet-usb-i1d3.c @@ -720,9 +720,7 @@ static int dissect_usb_i1d3( void proto_register_usb_i1d3(void) { - proto_usb_i1d3 = proto_register_protocol( - "X-Rite i1 Display Pro (and derivatives) USB protocol", - "X-Rite i1 Display Pro", "i1d3"); + proto_usb_i1d3 = proto_register_protocol("X-Rite i1 Display Pro (and derivatives) USB protocol", "X-Rite i1 Display Pro", "i1d3"); static gint *ett[] = { &ett_usb_i1d3, diff --git a/epan/dissectors/packet-usb-printer.c b/epan/dissectors/packet-usb-printer.c index d703133607..c03122f9b8 100644 --- a/epan/dissectors/packet-usb-printer.c +++ b/epan/dissectors/packet-usb-printer.c @@ -161,8 +161,7 @@ void proto_register_usb_printer(void) &ett_usb_printer }; - proto_usb_printer = proto_register_protocol( - "USB Printer", "USBPRINTER", "usbprinter"); + proto_usb_printer = proto_register_protocol("USB Printer", "USBPRINTER", "usbprinter"); proto_register_field_array(proto_usb_printer, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); usb_printer_ctl_handle = register_dissector("usbprinter", dissect_usb_printer_ctl, proto_usb_printer); diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index 9dd28fbdd5..7f0a671c4a 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -416,8 +416,7 @@ proto_register_vines_frp(void) &ett_vines_frp_flags }; - proto_vines_frp = proto_register_protocol( - "Banyan Vines Fragmentation Protocol", "Vines FRP", "vines_frp"); + proto_vines_frp = proto_register_protocol("Banyan Vines Fragmentation Protocol", "Vines FRP", "vines_frp"); proto_register_field_array(proto_vines_frp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); vines_frp_handle = register_dissector("vines_frp", dissect_vines_frp, proto_vines_frp); @@ -486,8 +485,7 @@ proto_register_vines_llc(void) &ett_vines_llc, }; - proto_vines_llc = proto_register_protocol( - "Banyan Vines LLC", "Vines LLC", "vines_llc"); + proto_vines_llc = proto_register_protocol("Banyan Vines LLC", "Vines LLC", "vines_llc"); proto_register_field_array(proto_vines_llc, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); vines_llc_handle = register_dissector("vines_llc", dissect_vines_llc, proto_vines_llc); @@ -741,8 +739,7 @@ proto_register_vines_echo(void) &ett_vines_echo, }; - proto_vines_echo = proto_register_protocol( - "Banyan Vines Echo", "Vines Echo", "vines_echo"); + proto_vines_echo = proto_register_protocol("Banyan Vines Echo", "Vines Echo", "vines_echo"); proto_register_field_array(proto_vines_echo, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); vines_echo_handle = register_dissector("vines_echo", dissect_vines_echo, @@ -1287,8 +1284,7 @@ proto_register_vines_arp(void) &ett_vines_arp, }; - proto_vines_arp = proto_register_protocol( - "Banyan Vines ARP", "Vines ARP", "vines_arp"); + proto_vines_arp = proto_register_protocol("Banyan Vines ARP", "Vines ARP", "vines_arp"); proto_register_field_array(proto_vines_arp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); vines_arp_handle = register_dissector("vines_arp", dissect_vines_arp, @@ -1881,8 +1877,7 @@ proto_register_vines_rtp(void) &ett_vines_rtp_flags, }; - proto_vines_rtp = proto_register_protocol( - "Banyan Vines RTP", "Vines RTP", "vines_rtp"); + proto_vines_rtp = proto_register_protocol("Banyan Vines RTP", "Vines RTP", "vines_rtp"); proto_register_field_array(proto_vines_rtp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); vines_rtp_handle = register_dissector("vines_rtp", dissect_vines_rtp, @@ -1990,8 +1985,7 @@ proto_register_vines_icp(void) &ett_vines_icp, }; - proto_vines_icp = proto_register_protocol( - "Banyan Vines ICP", "Vines ICP", "vines_icp"); + proto_vines_icp = proto_register_protocol("Banyan Vines ICP", "Vines ICP", "vines_icp"); /* Placeholder for capture statistics */ proto_vines = proto_register_protocol("VINES", "VINES", "vines"); proto_register_field_array(proto_vines_icp, hf, array_length(hf)); diff --git a/epan/dissectors/packet-vp9.c b/epan/dissectors/packet-vp9.c index 3330a99ed2..cab0ad3191 100644 --- a/epan/dissectors/packet-vp9.c +++ b/epan/dissectors/packet-vp9.c @@ -425,10 +425,7 @@ void proto_register_vp9(void) NULL, 0, NULL, HFILL}}}; - proto_vp9 = proto_register_protocol( - "VP9", - "VP9", - "vp9"); + proto_vp9 = proto_register_protocol("VP9", "VP9", "vp9"); proto_register_field_array(proto_vp9, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index b12677137b..2edf9979d4 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -314,8 +314,7 @@ void proto_register_vrrp(void) expert_module_t* expert_vrrp; module_t *vrrp_module; - proto_vrrp = proto_register_protocol("Virtual Router Redundancy Protocol", - "VRRP", "vrrp"); + proto_vrrp = proto_register_protocol("Virtual Router Redundancy Protocol", "VRRP", "vrrp"); proto_register_field_array(proto_vrrp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-waveagent.c b/epan/dissectors/packet-waveagent.c index 8c4704a951..e6b6a25902 100644 --- a/epan/dissectors/packet-waveagent.c +++ b/epan/dissectors/packet-waveagent.c @@ -1883,8 +1883,7 @@ void proto_register_waveagent(void) &ett_relaymessage, }; - proto_waveagent = proto_register_protocol( - "WaveAgent", "waveagent", "waveagent"); + proto_waveagent = proto_register_protocol("WaveAgent", "waveagent", "waveagent"); proto_register_field_array(proto_waveagent, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 3d33da281e..21045beeae 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -8144,11 +8144,7 @@ proto_register_wbxml(void) expert_module_t* expert_wbxml; /* Register the protocol name and description */ - proto_wbxml = proto_register_protocol( - "WAP Binary XML", - "WBXML", - "wbxml" - ); + proto_wbxml = proto_register_protocol("WAP Binary XML", "WBXML", "wbxml"); /* Required function calls to register the header fields * and subtrees used */ diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index 3d385477dd..3e5ede5a33 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -1001,8 +1001,7 @@ proto_register_websocket(void) module_t *websocket_module; expert_module_t* expert_websocket; - proto_websocket = proto_register_protocol("WebSocket", - "WebSocket", "websocket"); + proto_websocket = proto_register_protocol("WebSocket", "WebSocket", "websocket"); /* * Heuristic dissectors SHOULD register themselves in diff --git a/epan/dissectors/packet-wifi-nan.c b/epan/dissectors/packet-wifi-nan.c index 1efffaa6fc..cea457a22e 100644 --- a/epan/dissectors/packet-wifi-nan.c +++ b/epan/dissectors/packet-wifi-nan.c @@ -4155,10 +4155,7 @@ proto_register_nan(void) }, }; - proto_nan = proto_register_protocol( - "Wi-Fi Neighbor Awareness Networking (NAN)", - "Wi-Fi NAN", - "wifi_nan"); + proto_nan = proto_register_protocol("Wi-Fi Neighbor Awareness Networking (NAN)", "Wi-Fi NAN", "wifi_nan"); proto_register_field_array(proto_nan, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 70ff4aeea2..4e7ff93b90 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -7363,14 +7363,8 @@ proto_register_sir(void) /* Register the dissector */ - proto_sir = proto_register_protocol( - "WAP Session Initiation Request", /* protocol name for use by wireshark */ - "WAP SIR", /* short version of name */ - "wap-sir" /* Abbreviated protocol name, - should Match IANA: - < URL:http://www.iana.org/assignments/port-numbers/ > - */ - ); + /* Abbreviated protocol name should Match IANA: https://www.iana.org/assignments/port-numbers/ */ + proto_sir = proto_register_protocol("WAP Session Initiation Request", "WAP SIR", "wap-sir"); /* Register header fields and protocol subtrees */ proto_register_field_array(proto_sir, hf, array_length(hf)); diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index 6b05104446..5a46af127d 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -1019,13 +1019,8 @@ proto_register_wtp(void) }; /* Register the protocol name and description */ - proto_wtp = proto_register_protocol( - "Wireless Transaction Protocol", /* protocol name for use by wireshark */ - "WTP", /* short version of name */ - "wtp" /* Abbreviated protocol name, should Match IANA - < URL:http://www.iana.org/assignments/port-numbers/ > - */ - ); + /* Abbreviated protocol name should Match IANA: https://www.iana.org/assignments/port-numbers/ */ + proto_wtp = proto_register_protocol("Wireless Transaction Protocol", "WTP", "wtp"); /* Required calls to register the header fields and subtrees used */ proto_register_field_array(proto_wtp, hf, array_length(hf)); diff --git a/epan/dissectors/packet-xip-serval.c b/epan/dissectors/packet-xip-serval.c index 68a9c2d91e..d959744619 100644 --- a/epan/dissectors/packet-xip-serval.c +++ b/epan/dissectors/packet-xip-serval.c @@ -368,10 +368,7 @@ proto_register_xip_serval(void) expert_module_t* expert_xip_serval; - proto_xip_serval = proto_register_protocol( - "XIP Serval", - "XIP Serval", - "xipserval"); + proto_xip_serval = proto_register_protocol("XIP Serval", "XIP Serval", "xipserval"); register_dissector("xipserval", dissect_xip_serval, proto_xip_serval); proto_register_field_array(proto_xip_serval, hf, array_length(hf)); diff --git a/epan/dissectors/packet-xip.c b/epan/dissectors/packet-xip.c index a9689b0867..d39e832e9a 100644 --- a/epan/dissectors/packet-xip.c +++ b/epan/dissectors/packet-xip.c @@ -666,10 +666,7 @@ proto_register_xip(void) expert_module_t* expert_xip; - proto_xip = proto_register_protocol( - "eXpressive Internet Protocol", - "XIP", - "xip"); + proto_xip = proto_register_protocol("eXpressive Internet Protocol", "XIP", "xip"); xip_handle = register_dissector("xip", dissect_xip, proto_xip); proto_register_field_array(proto_xip, hf, array_length(hf)); diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index 71d8e4f9c0..08cd17484e 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -1458,11 +1458,7 @@ proto_register_xmpp(void) { ett_unknown_ptr[i] = &ett_unknown[i]; } - proto_xmpp = proto_register_protocol( - "XMPP Protocol", /* name */ - "XMPP", /* short name */ - "xmpp" /* abbrev */ - ); + proto_xmpp = proto_register_protocol("XMPP Protocol", "XMPP", "xmpp"); xmpp_module = prefs_register_protocol(proto_xmpp, NULL); prefs_register_bool_preference(xmpp_module, "desegment", |