diff options
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-klm.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-nfsacl.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-nlm.c | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-rquota.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ypserv.c | 7 |
7 files changed, 11 insertions, 23 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index a04b4f3348..bb6f5d95ce 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -4525,8 +4525,6 @@ dissect_krb5_ERROR(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx -static struct { const char *set; const char *unset; } bitval = { "Set", "Not set" }; - static gint dissect_kerberos_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static void dissect_kerberos_tcp(tvbuff_t *tvb, packet_info *pinfo, @@ -4762,7 +4760,7 @@ proto_register_kerberos(void) static hf_register_info hf[] = { { &hf_krb_rm_reserved, { "Reserved", "kerberos.rm.reserved", FT_BOOLEAN, 32, - &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, "Record length", HFILL }}, diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c index 95665f28a9..631470e134 100644 --- a/epan/dissectors/packet-klm.c +++ b/epan/dissectors/packet-klm.c @@ -209,7 +209,7 @@ proto_register_klm(void) VALS(klm1_proc_vals), 0, "V1 Procedure", HFILL }}, { &hf_klm_exclusive, { "exclusive", "klm.exclusive", FT_BOOLEAN, BASE_NONE, - &tfs_exclusive, 0, "Exclusive lock", HFILL }}, + TFS(&tfs_exclusive), 0, "Exclusive lock", HFILL }}, { &hf_klm_lock, { "lock", "klm.lock", FT_NONE, BASE_NONE, @@ -241,7 +241,7 @@ proto_register_klm(void) { &hf_klm_block, { "block", "klm.block", FT_BOOLEAN, BASE_NONE, - &tfs_block, 0, "Block", HFILL }}, + TFS(&tfs_block), 0, "Block", HFILL }}, }; diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index a594955161..4f85451933 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -243,8 +243,6 @@ static gint ett_ndmp_file_stats = -1; static gint ett_ndmp_file_invalids = -1; static gint ett_ndmp_state_invalids = -1; -static struct true_false_string yesno = { "Yes", "No" }; - /* XXX someone should start adding the new stuff from v3, v4 and v5*/ #define NDMP_PROTOCOL_UNKNOWN 0 #define NDMP_PROTOCOL_V2 2 @@ -3781,7 +3779,7 @@ proto_register_ndmp(void) NULL, 0, "Estimated time remaining", HFILL }}, { &hf_ndmp_lastfrag, { "Last Fragment", "ndmp.lastfrag", FT_BOOLEAN, 32, - &yesno, RPC_RM_LASTFRAG, "Last Fragment", HFILL }}, + TFS(&tfs_yes_no), RPC_RM_LASTFRAG, "Last Fragment", HFILL }}, { &hf_ndmp_fraglen, { "Fragment Length", "ndmp.fraglen", FT_UINT32, BASE_DEC, NULL, RPC_RM_FRAGLEN, "Fragment Length", HFILL }}, diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c index f859c4eb13..f2b3be7182 100644 --- a/epan/dissectors/packet-nfsacl.c +++ b/epan/dissectors/packet-nfsacl.c @@ -550,8 +550,6 @@ static const value_string nfsacl3_proc_vals[] = { { 0, NULL } }; -static struct true_false_string yesno = { "Yes", "No" }; - void proto_register_nfsacl(void) { @@ -590,7 +588,7 @@ proto_register_nfsacl(void) /* V2 */ { &hf_nfsacl_create, { "create", "nfsacl.create", FT_BOOLEAN, BASE_NONE, - &yesno, 0, "Create?", HFILL }}, + TFS(&tfs_yes_no), 0, "Create?", HFILL }}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c index ca60e5628e..859d386cfd 100644 --- a/epan/dissectors/packet-nlm.c +++ b/epan/dissectors/packet-nlm.c @@ -1131,9 +1131,6 @@ static const value_string nlm4_proc_vals[] = { /* end of NLM protocol version 4 */ -static struct true_false_string yesno = { "Yes", "No" }; - - void proto_register_nlm(void) { @@ -1155,10 +1152,10 @@ proto_register_nlm(void) NULL, 0, "cookie", HFILL }}, { &hf_nlm_block, { "block", "nlm.block", FT_BOOLEAN, BASE_NONE, - &yesno, 0, "block", HFILL }}, + TFS(&tfs_yes_no), 0, "block", HFILL }}, { &hf_nlm_exclusive, { "exclusive", "nlm.exclusive", FT_BOOLEAN, BASE_NONE, - &yesno, 0, "exclusive", HFILL }}, + TFS(&tfs_yes_no), 0, "exclusive", HFILL }}, { &hf_nlm_lock, { "lock", "nlm.lock", FT_NONE, 0, NULL, 0, "lock", HFILL }}, @@ -1185,7 +1182,7 @@ proto_register_nlm(void) NULL, 0, "l_len", HFILL }}, { &hf_nlm_reclaim, { "reclaim", "nlm.reclaim", FT_BOOLEAN, BASE_NONE, - &yesno, 0, "reclaim", HFILL }}, + TFS(&tfs_yes_no), 0, "reclaim", HFILL }}, { &hf_nlm_state, { "state", "nlm.state", FT_UINT32, BASE_DEC, NULL, 0, "STATD state", HFILL }}, diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c index f9421470f3..a153ab33f9 100644 --- a/epan/dissectors/packet-rquota.c +++ b/epan/dissectors/packet-rquota.c @@ -191,7 +191,7 @@ proto_register_rquota(void) { &hf_rquota_active, { "active", "rquota.active", FT_BOOLEAN, BASE_NONE, - &tfs_active, 0, "Indicates whether quota is active", HFILL }}, + TFS(&tfs_active), 0, "Indicates whether quota is active", HFILL }}, { &hf_rquota_bhardlimit, { "bhardlimit", "rquota.bhardlimit", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index fe754e7f4f..166b4ca582 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -611,9 +611,6 @@ static const value_string ypserv2_proc_vals[] = { void proto_register_ypserv(void) { - /*static struct true_false_string okfailed = { "Ok", "Failed" };*/ - static struct true_false_string yesno = { "Yes", "No" }; - static hf_register_info hf[] = { { &hf_ypserv_procedure_v1, { "V1 Procedure", "ypserv.procedure_v1", FT_UINT32, BASE_DEC, @@ -626,7 +623,7 @@ proto_register_ypserv(void) NULL, 0, "Domain", HFILL }}, { &hf_ypserv_servesdomain, { "Serves Domain", "ypserv.servesdomain", FT_BOOLEAN, BASE_NONE, - &yesno, 0, "Serves Domain", HFILL }}, + TFS(&tfs_yes_no), 0, "Serves Domain", HFILL }}, { &hf_ypserv_map, { "Map Name", "ypserv.map", FT_STRING, BASE_DEC, NULL, 0, "Map Name", HFILL }}, @@ -635,7 +632,7 @@ proto_register_ypserv(void) NULL, 0, "Peer Name", HFILL }}, { &hf_ypserv_more, { "More", "ypserv.more", FT_BOOLEAN, BASE_NONE, - &yesno, 0, "More", HFILL }}, + TFS(&tfs_yes_no), 0, "More", HFILL }}, { &hf_ypserv_ordernum, { "Order Number", "ypserv.ordernum", FT_UINT32, BASE_DEC, NULL, 0, "Order Number for XFR", HFILL }}, |