Don't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.

[obnox/wireshark/wip.git] / epan / dissectors / packet-yhoo.c

diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c
index 15d2157866db228be631e8e4cf3ee3dd3c978d4f..35577d3a6eb29091007fc529c96b166940946220 100644 (file)
--- a/epan/dissectors/packet-yhoo.c
+++ b/epan/dissectors/packet-yhoo.c
@@ -208,47 +208,47 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        if (tree) {
                ti = proto_tree_add_item(tree, proto_yhoo, tvb, offset, -1,
-                       FALSE);
+                       ENC_NA);
                yhoo_tree = proto_item_add_subtree(ti, ett_yhoo);
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_version, tvb,
-                       offset, 8, TRUE);
+                       offset, 8, ENC_ASCII|ENC_NA);
                offset += 8;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_len, tvb,
-                       offset, 4, TRUE);
+                       offset, 4, ENC_LITTLE_ENDIAN);
                offset += 4;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_service, tvb,
-                       offset, 4, TRUE);
+                       offset, 4, ENC_LITTLE_ENDIAN);
                offset += 4;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_connection_id, tvb,
-                       offset, 4, TRUE);
+                       offset, 4, ENC_LITTLE_ENDIAN);
                offset += 4;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_magic_id, tvb,
-                       offset, 4, TRUE);
+                       offset, 4, ENC_LITTLE_ENDIAN);
                offset += 4;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_unknown1, tvb,
-                       offset, 4, TRUE);
+                       offset, 4, ENC_LITTLE_ENDIAN);
                offset += 4;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_msgtype, tvb,
-                       offset, 4, TRUE);
+                       offset, 4, ENC_LITTLE_ENDIAN);
                offset += 4;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_nick1, tvb,
-                       offset, 36, TRUE);
+                       offset, 36, ENC_ASCII|ENC_NA);
                offset += 36;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_nick2, tvb,
-                       offset, 36, TRUE);
+                       offset, 36, ENC_ASCII|ENC_NA);
                offset += 36;
 
                proto_tree_add_item(yhoo_tree, hf_yhoo_content, tvb, -1,
-                       offset, TRUE);
+                       offset, ENC_ASCII|ENC_NA);
        }
 
        return TRUE;