diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-05-28 17:38:58 -0400 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-05-28 21:47:48 +0000 |
commit | 40a21bc99c57596c88820c8c37639cc2354bc582 (patch) | |
tree | 4b774dd1c4bdcc9ca674e27c58e030d280ddc713 | |
parent | d817b27d6dd3edc3f83845fe435b959bfd5b9aa5 (diff) |
packet-kerberos.c: Use tfs_set_notset in hf[] entry instead of a local version.
Change-Id: I00a3ae7afb46eb50d7477c22cfa340c705cbb34a
Reviewed-on: https://code.wireshark.org/review/1851
Reviewed-by: Bill Meier <wmeier@newsguy.com>
-rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-kerberos.c | 16 |
2 files changed, 8 insertions, 12 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index cde65385c0..f2fb995062 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -132,8 +132,6 @@ static gboolean krb_desegment = TRUE; static gint proto_kerberos = -1; -static const true_false_string bitval = { "Set", "Not set" }; - static gint hf_krb_rm_reserved = -1; static gint hf_krb_rm_reclen = -1; static gint hf_krb_provsrv_location = -1; @@ -1902,7 +1900,7 @@ void proto_register_kerberos(void) { static hf_register_info hf[] = { { &hf_krb_rm_reserved, { "Reserved", "kerberos.rm.reserved", FT_BOOLEAN, 32, - TFS(&bitval), KRB_RM_RESERVED, "Record mark reserved bit", HFILL }}, + TFS(&tfs_set_notset), KRB_RM_RESERVED, "Record mark reserved bit", HFILL }}, { &hf_krb_rm_reclen, { "Record Length", "kerberos.rm.length", FT_UINT32, BASE_DEC, NULL, KRB_RM_RECLEN, NULL, HFILL }}, diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index cc25b2c3a9..1aa4e6fad1 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -140,8 +140,6 @@ static gboolean krb_desegment = TRUE; static gint proto_kerberos = -1; -static const true_false_string bitval = { "Set", "Not set" }; - static gint hf_krb_rm_reserved = -1; static gint hf_krb_rm_reclen = -1; static gint hf_krb_provsrv_location = -1; @@ -330,7 +328,7 @@ static int hf_kerberos_KDCOptions_renew = -1; static int hf_kerberos_KDCOptions_validate = -1; /*--- End of included file: packet-kerberos-hf.c ---*/ -#line 157 "../../asn1/kerberos/packet-kerberos-template.c" +#line 155 "../../asn1/kerberos/packet-kerberos-template.c" /* Initialize the subtree pointers */ static gint ett_kerberos = -1; @@ -394,7 +392,7 @@ static gint ett_kerberos_KERB_PA_PAC_REQUEST = -1; static gint ett_kerberos_ChangePasswdData = -1; /*--- End of included file: packet-kerberos-ett.c ---*/ -#line 163 "../../asn1/kerberos/packet-kerberos-template.c" +#line 161 "../../asn1/kerberos/packet-kerberos-template.c" static expert_field ei_kerberos_decrypted_keytype = EI_INIT; @@ -421,7 +419,7 @@ static gboolean gbl_do_col_info; #define KERBEROS_ADDR_TYPE_IPV6 24 /*--- End of included file: packet-kerberos-val.h ---*/ -#line 174 "../../asn1/kerberos/packet-kerberos-template.c" +#line 172 "../../asn1/kerberos/packet-kerberos-template.c" static void call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag, kerberos_callbacks *cb) @@ -3920,7 +3918,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-kerberos-fn.c ---*/ -#line 1663 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1661 "../../asn1/kerberos/packet-kerberos-template.c" /* Make wrappers around exported functions for now */ int @@ -4163,7 +4161,7 @@ void proto_register_kerberos(void) { static hf_register_info hf[] = { { &hf_krb_rm_reserved, { "Reserved", "kerberos.rm.reserved", FT_BOOLEAN, 32, - TFS(&bitval), KRB_RM_RESERVED, "Record mark reserved bit", HFILL }}, + TFS(&tfs_set_notset), KRB_RM_RESERVED, "Record mark reserved bit", HFILL }}, { &hf_krb_rm_reclen, { "Record Length", "kerberos.rm.length", FT_UINT32, BASE_DEC, NULL, KRB_RM_RECLEN, NULL, HFILL }}, @@ -4876,7 +4874,7 @@ void proto_register_kerberos(void) { NULL, HFILL }}, /*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 1962 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1960 "../../asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -4941,7 +4939,7 @@ void proto_register_kerberos(void) { &ett_kerberos_ChangePasswdData, /*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 1969 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1967 "../../asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { |