aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-xmcp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-xmcp.c')
-rw-r--r--epan/dissectors/packet-xmcp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c
index 39f70cd683..ab3f820fe0 100644
--- a/epan/dissectors/packet-xmcp.c
+++ b/epan/dissectors/packet-xmcp.c
@@ -416,7 +416,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type,
switch (attr_type) {
case XMCP_USERNAME:
proto_tree_add_item(attr_tree, xmcp_attr_username, tvb, offset,
- attr_length, ENC_ASCII|ENC_NA);
+ attr_length, ENC_ASCII);
proto_item_append_text(attr_tree, ": %s",
tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII));
/*
@@ -486,14 +486,14 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type,
if (attr_length < 5)
break;
proto_tree_add_item(attr_tree, xmcp_attr_error_reason, tvb, (offset+4),
- (attr_length - 4), ENC_ASCII|ENC_NA);
+ (attr_length - 4), ENC_ASCII);
proto_item_append_text(attr_tree, " (%s)",
tvb_get_string_enc(pinfo->pool, tvb, (offset+4),
(attr_length-4), ENC_ASCII));
break;
case XMCP_REALM:
it = proto_tree_add_item(attr_tree, xmcp_attr_realm, tvb, offset,
- attr_length, ENC_ASCII|ENC_NA);
+ attr_length, ENC_ASCII);
{
guint8 *realm;
realm = tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII);
@@ -506,13 +506,13 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type,
break;
case XMCP_NONCE:
proto_tree_add_item(attr_tree, xmcp_attr_nonce, tvb, offset,
- attr_length, ENC_ASCII|ENC_NA);
+ attr_length, ENC_ASCII);
proto_item_append_text(attr_tree, ": %s",
tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII));
break;
case XMCP_CLIENT_NAME:
proto_tree_add_item(attr_tree, xmcp_attr_client_name, tvb, offset,
- attr_length, ENC_ASCII|ENC_NA);
+ attr_length, ENC_ASCII);
proto_item_append_text(attr_tree, ": %s",
tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII));
col_append_fstr(pinfo->cinfo, COL_INFO, ", name \"%s\"",
@@ -555,7 +555,7 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type,
break;
case XMCP_CLIENT_LABEL:
proto_tree_add_item(attr_tree, xmcp_attr_client_label, tvb, offset,
- attr_length, ENC_ASCII|ENC_NA);
+ attr_length, ENC_ASCII);
proto_item_append_text(attr_tree, ": %s",
tvb_get_string_enc(pinfo->pool, tvb, offset, attr_length, ENC_ASCII));
col_append_fstr(pinfo->cinfo, COL_INFO, ", label \"%s\"",