Rename "dissect_ndr_char_array" and "disect_ndr_wchar_array" to

"dissect_ndr_char_string" and "dissect_ndr_wchar_string", to make it
clearer what it does.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7095 f5534014-38df-0310-8fa8-9805f1628bb7

8 files changed, 38 insertions, 30 deletions

diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c
index 15c519e068..b7db5611ef 100644
--- a/packet-dcerpc-lsa.c
+++ b/packet-dcerpc-lsa.c
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *  2002  Added LSA command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-lsa.c,v 1.69 2003/02/07 08:33:07 guy Exp $
+ * $Id: packet-dcerpc-lsa.c,v 1.70 2003/02/07 22:31:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -596,7 +596,7 @@ lsa_dissect_lsaopenpolicy2_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_pointer_cb(tvb, offset, pinfo, tree, drep,
-		dissect_ndr_wchar_array, NDR_POINTER_UNIQUE, "Server", 
+		dissect_ndr_wchar_string, NDR_POINTER_UNIQUE, "Server", 
 		hf_lsa_server, cb_str_postprocess, 
 		GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
 
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c
index a353229a58..32399a8848 100644
--- a/packet-dcerpc-netlogon.c
+++ b/packet-dcerpc-netlogon.c
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *  2002 structure and command dissectors by Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-netlogon.c,v 1.71 2003/02/03 02:14:00 tpot Exp $
+ * $Id: packet-dcerpc-netlogon.c,v 1.72 2003/02/07 22:31:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1398,7 +1398,7 @@ netlogon_dissect_netserverreqchallenge_rqst(tvbuff_t *tvb, int offset,
 
 	offset = dissect_ndr_pointer_cb(
 		tvb, offset, pinfo, tree, drep, 
-		dissect_ndr_wchar_array, NDR_POINTER_REF, 
+		dissect_ndr_wchar_string, NDR_POINTER_REF, 
 		"Computer Name", hf_netlogon_computer_name, 
 		cb_str_postprocess, 
 		GINT_TO_POINTER(CB_STR_COL_INFO | 1));
@@ -4424,7 +4424,7 @@ netlogon_dissect_UNICODE_STRING(tvbuff_t *tvb, int offset,
 	}
 
 	offset = dissect_ndr_pointer_cb(tvb, offset, pinfo, tree, drep,
-			dissect_ndr_wchar_array, type,
+			dissect_ndr_wchar_string, type,
 			name, hf_index, callback, NULL);
 
 	proto_item_set_len(item, offset-old_offset);
diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c
index 9ad6c2345a..6d71b4f742 100644
--- a/packet-dcerpc-nt.c
+++ b/packet-dcerpc-nt.c
@@ -2,7 +2,7 @@
  * Routines for DCERPC over SMB packet disassembly
  * Copyright 2001-2003, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-nt.c,v 1.64 2003/02/07 08:56:11 guy Exp $
+ * $Id: packet-dcerpc-nt.c,v 1.65 2003/02/07 22:31:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,7 +81,7 @@ dissect_ndr_counted_string_cb(tvbuff_t *tvb, int offset,
 			hf_nt_cs_size, &size);	
 
 	offset = dissect_ndr_pointer_cb(tvb, offset, pinfo, tree, drep,
-			dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
+			dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
 			"Character Array", hf_index, callback, callback_args);
 
 	return offset;
@@ -676,7 +676,7 @@ int dissect_ndr_str_pointer_item(tvbuff_t *tvb, gint offset,
 {
 	return dissect_ndr_pointer_cb(
 		tvb, offset, pinfo, tree, drep, 
-		dissect_ndr_wchar_array, type, text, hf_index, 
+		dissect_ndr_wchar_string, type, text, hf_index, 
 		cb_str_postprocess, GINT_TO_POINTER(levels + 1));
 }
 
diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c
index 8a181932dd..d79a3d9170 100644
--- a/packet-dcerpc-samr.c
+++ b/packet-dcerpc-samr.c
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *   2002 Added all command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-samr.c,v 1.73 2003/02/07 08:37:13 guy Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.74 2003/02/07 22:31:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1135,7 +1135,7 @@ samr_dissect_connect2_rqst(tvbuff_t *tvb, int offset,
 {
 	offset = dissect_ndr_pointer_cb(
 		tvb, offset, pinfo, tree, drep,
-		dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
+		dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
 		"Server", hf_samr_server, cb_str_postprocess,
 		GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
 
@@ -1153,7 +1153,7 @@ samr_dissect_connect4_rqst(tvbuff_t *tvb, int offset,
 {
 	offset = dissect_ndr_pointer_cb(
 		tvb, offset, pinfo, tree, drep,
-		dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
+		dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
 		"Server", hf_samr_server, cb_str_postprocess,
 		GINT_TO_POINTER(CB_STR_COL_INFO | 1));
 
diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c
index d5d934e96b..ec9319fa7e 100644
--- a/packet-dcerpc-spoolss.c
+++ b/packet-dcerpc-spoolss.c
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\spoolss packet disassembly
  * Copyright 2001-2003, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-spoolss.c,v 1.83 2003/02/07 08:56:11 guy Exp $
+ * $Id: packet-dcerpc-spoolss.c,v 1.84 2003/02/07 22:31:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2703,7 +2703,7 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
 
 	offset = dissect_ndr_pointer_cb(
 		tvb, offset, pinfo, tree, drep,
-		dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
+		dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
 		"Printer name", hf_spoolss_printername, cb_str_postprocess,
 		GINT_TO_POINTER(CB_STR_COL_INFO | CB_STR_SAVE | 1));
 
diff --git a/packet-dcerpc-srvsvc.c b/packet-dcerpc-srvsvc.c
index 84954cbc0f..28cf2a466d 100644
--- a/packet-dcerpc-srvsvc.c
+++ b/packet-dcerpc-srvsvc.c
@@ -9,7 +9,7 @@
  * 2002, some share information levels implemented based on samba
  * sources.
  *
- * $Id: packet-dcerpc-srvsvc.c,v 1.50 2003/02/03 02:14:01 tpot Exp $
+ * $Id: packet-dcerpc-srvsvc.c,v 1.51 2003/02/07 22:31:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2947,13 +2947,13 @@ srvsvc_dissect_netrsharegetinfo_rqst(tvbuff_t *tvb, int offset,
 {
 	offset = dissect_ndr_pointer_cb(
 		tvb, offset, pinfo, tree, drep,
-		dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
+		dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
 		"Server", hf_srvsvc_server, cb_str_postprocess,
 		GINT_TO_POINTER(CB_STR_COL_INFO | 1));
 
 	offset = dissect_ndr_pointer_cb(
 		tvb, offset, pinfo, tree, drep,
-		dissect_ndr_wchar_array, NDR_POINTER_REF,
+		dissect_ndr_wchar_string, NDR_POINTER_REF,
 		"Share", hf_srvsvc_share, cb_str_postprocess,
 		GINT_TO_POINTER(CB_STR_COL_INFO | 1));
 
@@ -5294,7 +5294,7 @@ srvsvc_dissect_netrservergetinfo_rqst(tvbuff_t *tvb, int offset,
 {
 	offset = dissect_ndr_pointer_cb(
 		tvb, offset, pinfo, tree, drep,
-		dissect_ndr_wchar_array, NDR_POINTER_UNIQUE,
+		dissect_ndr_wchar_string, NDR_POINTER_UNIQUE,
 		"Server", hf_srvsvc_server, cb_str_postprocess,
 		GINT_TO_POINTER(CB_STR_COL_INFO | 1));
 
diff --git a/packet-dcerpc.c b/packet-dcerpc.c
index 1b56f12694..622f548dd4 100644
--- a/packet-dcerpc.c
+++ b/packet-dcerpc.c
@@ -2,7 +2,7 @@
  * Routines for DCERPC packet disassembly
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc.c,v 1.102 2003/02/07 19:45:56 guy Exp $
+ * $Id: packet-dcerpc.c,v 1.103 2003/02/07 22:31:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -912,13 +912,21 @@ dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 	return offset;
 }
 
-/* Dissect an array of bytes.  This corresponds to
-   IDL of the form '[string] char *foo'.  Used when the bytes
-   should be shown as a big blob, rather than showing each one
-   as an individual element.
+/* Dissect an string of bytes.  This corresponds to
+   IDL of the form '[string] byte *foo'.
+
+   It can also be used for a conformant varying array of bytes if
+   the contents of the array should be shown as a big blob, rather
+   than showing each byte as an individual element.
+
+   XXX - which of those is really the IDL type for, for example,
+   the encrypted data in some MAPI packets?  (Microsoft haven't
+   released that IDL.)
 
    XXX - does this need to do all the conformant array stuff that
-   "dissect_ndr_ucvarray()" does?  */
+   "dissect_ndr_ucvarray()" does?  These are presumably for strings
+   that are conformant and varying - they're stored like conformant
+   varying arrays of bytes.  */
 int
 dissect_ndr_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo, 
                             proto_tree *tree, char *drep)
@@ -1055,11 +1063,11 @@ dissect_ndr_character_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
     return offset;
 }
 
-/* Dissect an array of chars.  This corresponds to
+/* Dissect an string of chars.  This corresponds to
    IDL of the form '[string] char *foo' */
 
 int
-dissect_ndr_char_array(tvbuff_t *tvb, int offset, packet_info *pinfo, 
+dissect_ndr_char_string(tvbuff_t *tvb, int offset, packet_info *pinfo, 
 			proto_tree *tree, char *drep)
 {
     return dissect_ndr_character_array(tvb, offset, pinfo, tree, drep,
@@ -1067,11 +1075,11 @@ dissect_ndr_char_array(tvbuff_t *tvb, int offset, packet_info *pinfo,
                                        FALSE);
 }
 
-/* Dissect an array of wchars (wide characters).  This corresponds to
+/* Dissect an string of wchars (wide characters).  This corresponds to
    IDL of the form '[string] wchar *foo' */
 
 int
-dissect_ndr_wchar_array(tvbuff_t *tvb, int offset, packet_info *pinfo, 
+dissect_ndr_wchar_string(tvbuff_t *tvb, int offset, packet_info *pinfo, 
 			proto_tree *tree, char *drep)
 {
     return dissect_ndr_character_array(tvb, offset, pinfo, tree, drep,
diff --git a/packet-dcerpc.h b/packet-dcerpc.h
index a11b8d744a..3a10956f4d 100644
--- a/packet-dcerpc.h
+++ b/packet-dcerpc.h
@@ -1,7 +1,7 @@
 /* packet-dcerpc.h
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc.h,v 1.27 2003/02/07 08:56:12 guy Exp $
+ * $Id: packet-dcerpc.h,v 1.28 2003/02/07 22:31:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -196,9 +196,9 @@ char *fake_unicode(tvbuff_t *tvb, int offset, int len);
 int dissect_ndr_character_array(tvbuff_t *tvb, int offset, packet_info *pinfo, 
                                proto_tree *tree, char *drep, int size_is,
                                int hfinfo, gboolean add_subtree);
-int dissect_ndr_char_array(tvbuff_t *tvb, int offset, packet_info *pinfo, 
+int dissect_ndr_char_string(tvbuff_t *tvb, int offset, packet_info *pinfo, 
                            proto_tree *tree, char *drep);
-int dissect_ndr_wchar_array(tvbuff_t *tvb, int offset, packet_info *pinfo, 
+int dissect_ndr_wchar_string(tvbuff_t *tvb, int offset, packet_info *pinfo, 
                             proto_tree *tree, char *drep);
 
 typedef struct _dcerpc_sub_dissector {