summaryrefslogtreecommitdiff
path: root/asn1/c1222
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2012-01-15 17:07:55 +0000
committerJörg Mayer <jmayer@loplof.de>2012-01-15 17:07:55 +0000
commitde0bf160b94a32373bd089818681e87add94baee (patch)
tree6bde84dc80719972ca5b4d63929ad5522aa55889 /asn1/c1222
parentb06856c589844d70d7c16f0e2248ea00f8c5155e (diff)
downloadwireshark-de0bf160b94a32373bd089818681e87add94baee.tar.gz
The warning fix overdid things: It removed functionality.
Now I only remove the variable ft and everything looks good. svn path=/trunk/; revision=40516
Diffstat (limited to 'asn1/c1222')
-rw-r--r--asn1/c1222/packet-c1222-template.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c
index 1692451a7d..32ba83845a 100644
--- a/asn1/c1222/packet-c1222-template.c
+++ b/asn1/c1222/packet-c1222-template.c
@@ -100,7 +100,6 @@ static int hf_c1222_epsem_flags_ed_class = -1;
static int hf_c1222_epsem_flags_security_modes = -1;
static int hf_c1222_epsem_flags_response_control = -1;
/* and the structure of the flag components */
-/*
static const int *c1222_flags[] = {
&hf_c1222_epsem_flags_reserved,
&hf_c1222_epsem_flags_recovery,
@@ -110,7 +109,6 @@ static const int *c1222_flags[] = {
&hf_c1222_epsem_flags_response_control,
NULL
};
-*/
/* next the optional ed_class */
static int hf_c1222_epsem_ed_class = -1;
/* now the aggregate epsem */
@@ -859,7 +857,6 @@ ber_len_ok(tvbuff_t *tvb, int offset)
static int
dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_tree *tree)
{
- /* proto_tree *ft = NULL; */
proto_tree *cmd_tree = NULL;
proto_tree *ct = NULL;
proto_tree *crypto_tree = NULL;
@@ -883,7 +880,7 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_
}
/* parse the flags byte which is always unencrypted */
flags = tvb_get_guint8(tvb, offset);
- /* ft = proto_tree_add_bitmask(tree, tvb, offset, hf_c1222_epsem_flags, ett_c1222_flags, c1222_flags, FALSE); */
+ proto_tree_add_bitmask(tree, tvb, offset, hf_c1222_epsem_flags, ett_c1222_flags, c1222_flags, FALSE);
offset++;
switch ((flags & C1222_EPSEM_FLAG_SECURITY_MODE) >> 2) {
case EAX_MODE_CIPHERTEXT_AUTH: