From Kovarththanan Rajaratnam:

More header field info cleanup

svn path=/trunk/; revision=28975

2 files changed, 9 insertions, 3 deletions

diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index 0571d8018e..175c3fa8c5 100755
--- a/epan/dissectors/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
@@ -898,7 +898,7 @@ class boolean32(uint32):
 	disp	= "BASE_NONE"
 
 class nstring:
-	disp	= "BASE_NONE"
+	pass
 
 class nstring8(Type, nstring):
 	"""A string of up to (2^8)-1 characters. The first byte
@@ -906,6 +906,7 @@ class nstring8(Type, nstring):
 
 	type	= "nstring8"
 	ftype	= "FT_UINT_STRING"
+	disp	= "BASE_NONE"
 	def __init__(self, abbrev, descr):
 		Type.__init__(self, abbrev, descr, 1)
 
@@ -915,6 +916,7 @@ class nstring16(Type, nstring):
 
 	type	= "nstring16"
 	ftype	= "FT_UINT_STRING"
+	disp	= "BASE_NONE"
 	def __init__(self, abbrev, descr, endianness = LE):
 		Type.__init__(self, abbrev, descr, 2, endianness)
 
@@ -924,6 +926,7 @@ class nstring32(Type, nstring):
 
 	type	= "nstring32"
 	ftype	= "FT_UINT_STRING"
+	disp	= "BASE_NONE"
 	def __init__(self, abbrev, descr, endianness = LE):
 		Type.__init__(self, abbrev, descr, 4, endianness)
 
@@ -1007,7 +1010,7 @@ class bytes(Type):
 		Type.__init__(self, abbrev, descr, bytes, NA)
 
 class nbytes:
-	disp	= "BASE_NONE"
+	pass
 
 class nbytes8(Type, nbytes):
 	"""A series of up to (2^8)-1 bytes. The first byte
@@ -1015,6 +1018,7 @@ class nbytes8(Type, nbytes):
 
 	type	= "nbytes8"
 	ftype	= "FT_UINT_BYTES"
+	disp	= "BASE_NONE"
 	def __init__(self, abbrev, descr, endianness = LE):
 		Type.__init__(self, abbrev, descr, 1, endianness)
 
@@ -1024,6 +1028,7 @@ class nbytes16(Type, nbytes):
 
 	type	= "nbytes16"
 	ftype	= "FT_UINT_BYTES"
+	disp	= "BASE_NONE"
 	def __init__(self, abbrev, descr, endianness = LE):
 		Type.__init__(self, abbrev, descr, 2, endianness)
 
@@ -1033,6 +1038,7 @@ class nbytes32(Type, nbytes):
 
 	type	= "nbytes32"
 	ftype	= "FT_UINT_BYTES"
+	disp	= "BASE_NONE"
 	def __init__(self, abbrev, descr, endianness = LE):
 		Type.__init__(self, abbrev, descr, 4, endianness)
 
diff --git a/epan/gcp.h b/epan/gcp.h
index 5ed5575e7a..e0532a27ab 100644
--- a/epan/gcp.h
+++ b/epan/gcp.h
@@ -215,6 +215,6 @@ extern gchar* gcp_msg_to_str(gcp_msg_t* m, gboolean persistent);
   { &(gi.hf.ctx_term_type), { "Type", n ".ctx.term.type", FT_UINT32, BASE_HEX, VALS(gcp_term_types), 0, NULL, HFILL }}, \
   { &(gi.hf.ctx_term_bir), { "BIR", n ".ctx.term.bir", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, \
   { &(gi.hf.ctx_term_nsap), { "NSAP", n ".ctx.term.nsap", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, \
-  { &(gi.hf.ctx_cmd), { "Command in Frame", n ".ctx.cmd", FT_FRAMENUM, BASE_DEC, NULL, 0, NULL, HFILL }}
+  { &(gi.hf.ctx_cmd), { "Command in Frame", n ".ctx.cmd", FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }}
 
 #endif