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-dcerpc-tapi.c

diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c
index 628b04841db5e2da2c564cb742b53bd729060308..b8b59f266624c3c08ca705eb9d71914eef426cd0 100644 (file)
--- a/epan/dissectors/packet-dcerpc-tapi.c
+++ b/epan/dissectors/packet-dcerpc-tapi.c
@@ -4,8 +4,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "packet-dcerpc-tapi.h"
-#include "smb.h"
+#include "packet-windows-common.h"
 
 static int proto_dcerpc_tapi = -1;
 static int hf_tapi_opnum = -1;
@@ -79,11 +79,11 @@ dissect_tapi_client_attach_rqst(tvbuff_t *tvb, int offset,
                hf_tapi_unknown_long, NULL);
 
        offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep,
-                       NDR_POINTER_REF, "unknown string", 
+                       NDR_POINTER_REF, "unknown string",
                         hf_tapi_unknown_string, 0);
 
        offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep,
-                       NDR_POINTER_REF, "unknown string", 
+                       NDR_POINTER_REF, "unknown string",
                         hf_tapi_unknown_string, 0);
 
        return offset;
@@ -121,14 +121,14 @@ dissect_tapi_TYPE_1(tvbuff_t *tvb, int offset,
 
        di=pinfo->private_data;
        if(di->conformant_run){
-               /* this call is to make ethereal eat the array header for the conformant run */
+               /* this call is to make wireshark eat the array header for the conformant run */
                offset =dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, NULL);
 
                return offset;
        }
 
        proto_tree_add_item(tree, hf_tapi_unknown_bytes, tvb, offset,
-               di->array_actual_count, FALSE);
+               di->array_actual_count, ENC_NA);
        offset += di->array_actual_count;
 
        return offset;
@@ -204,24 +204,24 @@ void
 proto_register_dcerpc_tapi(void)
 {
 static hf_register_info hf[] = {
-       { &hf_tapi_opnum, { 
+       { &hf_tapi_opnum, {
                "Operation", "tapi.opnum", FT_UINT16, BASE_DEC,
-               NULL, 0x0, "", HFILL }},
+               NULL, 0x0, NULL, HFILL }},
        { &hf_tapi_rc, {
                "Return code", "tapi.rc", FT_UINT32, BASE_HEX,
                VALS(NT_errors), 0x0, "TAPI return code", HFILL }},
        { &hf_tapi_hnd, {
                "Context Handle", "tapi.hnd", FT_BYTES, BASE_NONE,
-               NULL, 0x0, "Context handle", HFILL }},
+               NULL, 0x0, NULL, HFILL }},
        { &hf_tapi_unknown_long, {
                "Unknown long", "tapi.unknown.long", FT_UINT32, BASE_HEX,
-               NULL, 0x0, "Unknown long. If you know what this is, contact ethereal developers.", HFILL }},
+               NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
        { &hf_tapi_unknown_string, {
-               "Unknown string", "tapi.unknown.string", FT_STRING, BASE_HEX,
-               NULL, 0x0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }},
+               "Unknown string", "tapi.unknown.string", FT_STRING, BASE_NONE,
+               NULL, 0x0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }},
        { &hf_tapi_unknown_bytes, {
-               "Unknown bytes", "tapi.unknown.bytes", FT_BYTES, BASE_HEX,
-               NULL, 0x0, "Unknown bytes. If you know what this is, contact ethereal developers.", HFILL }}
+               "Unknown bytes", "tapi.unknown.bytes", FT_BYTES, BASE_NONE,
+               NULL, 0x0, "Unknown bytes. If you know what this is, contact wireshark developers.", HFILL }}
        };
 
         static gint *ett[] = {