change a whole bunch of ethereal into wireshark

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

diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index 74c94c41763dae307ed9ee62a618fab6ea33c11b..798db3e2890001ce3508aafb2b868a71e7a03c98 100644 (file)
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
@@ -7,8 +7,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
@@ -41,7 +41,7 @@
 
 /*
  * This file contains helper routines that are used by the DCERPC over SMB
- * dissectors for ethereal.
+ * dissectors for wireshark.
  */
 
 /*
@@ -808,13 +808,16 @@ static gint ett_nt_policy_hnd = -1;
  * as used in dcerpc  but it has shown VERY useful to also use it for tracking
  * GUIDs such as for the file ids in smb2.
  */
-#define HND_TYPE_CTX_HANDLE    0
-#define HND_TYPE_GUID          1
+typedef enum {
+       HND_TYPE_CTX_HANDLE,
+       HND_TYPE_GUID
+} e_hnd_type;
+
 static int
 dissect_nt_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                      proto_tree *tree, guint8 *drep, int hfindex,
                      e_ctx_hnd *pdata, proto_item **pitem,
-                     gboolean is_open, gboolean is_close, int type)
+                     gboolean is_open, gboolean is_close, e_hnd_type type)
 {
        proto_item *item=NULL;
        proto_tree *subtree;
@@ -856,6 +859,9 @@ dissect_nt_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                hnd.attributes=0;
                offset=dissect_ndr_uuid_t(tvb, offset, pinfo, subtree, drep, hfindex, &hnd.uuid);
                break;
+       default:
+               DISSECTOR_ASSERT_NOT_REACHED();
+               return offset;
        }
 
        /*
@@ -1678,7 +1684,7 @@ void dcerpc_smb_init(int proto_dcerpc)
                  { "Unknown char", "nt.unknown.char",
                    FT_UINT8, BASE_HEX, NULL, 0x0,
                    "Unknown char. If you know what this is, contact "
-                   "ethereal developers.", HFILL }},
+                   "wireshark developers.", HFILL }},
 
                /* Misc */