From packet steve: get rid of some duplicate field definitions (some

aren't exactly duplicates, but they both set the same hf_ variable).

svn path=/trunk/; revision=8621

6 files changed, 6 insertions, 28 deletions

diff --git a/packet-dcerpc-rpriv.c b/packet-dcerpc-rpriv.c
index ccda61b78a..9601b1d632 100644
--- a/packet-dcerpc-rpriv.c
+++ b/packet-dcerpc-rpriv.c
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz  security/idl/rpriv.idl
  *
- * $Id: packet-dcerpc-rpriv.c,v 1.5 2003/08/04 02:49:01 tpot Exp $
+ * $Id: packet-dcerpc-rpriv.c,v 1.6 2003/10/06 08:35:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -125,8 +125,6 @@ proto_register_rpriv (void)
          { "Authz_Svc", "rpriv.get_eptgt_rqst_authz_svc", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
       { &hf_rpriv_get_eptgt_rqst_key_size,
          { "Key_Size", "rpriv.get_eptgt_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
-      { &hf_rpriv_get_eptgt_rqst_key_size,
-         { "Key_Size", "rpriv.get_eptgt_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
       { &hf_rpriv_get_eptgt_rqst_var1,
          { "Var1", "rpriv.get_eptgt_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
       { &hf_rpriv_get_eptgt_rqst_key_size2,
diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c
index a2455fef1c..623d22b12b 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.104 2003/08/04 02:49:00 tpot Exp $
+ * $Id: packet-dcerpc-spoolss.c,v 1.105 2003/10/06 08:35:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -7124,10 +7124,6 @@ proto_register_dcerpc_spoolss(void)
 		    FT_UINT32, BASE_DEC, NULL, 0, "Driver extra length", 
 		    HFILL }},
 
-		{ &hf_devmode_driver_extra,
-		  { "Driver extra", "spoolss.devmode.driver_extra",
-		    FT_BYTES, BASE_HEX, NULL, 0, "Driver extra", HFILL }},
-
 		/* Devicemode fields */
 
 		{ &hf_devmode_fields_orientation,
diff --git a/packet-isup.c b/packet-isup.c
index 782ea2d54c..542c31bff2 100644
--- a/packet-isup.c
+++ b/packet-isup.c
@@ -5,7 +5,7 @@
  *		<anders.broman@ericsson.com>
  * Inserted routines for BICC dissection according to Q.765.5 Q.1902 Q.1970 Q.1990,
  * calling SDP dissector for RFC2327 decoding.
- * $Id: packet-isup.c,v 1.29 2003/10/03 20:58:13 guy Exp $
+ * $Id: packet-isup.c,v 1.30 2003/10/06 08:35:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -5246,11 +5246,6 @@ proto_register_isup(void)
 			FT_BOOLEAN, 8, TFS(&isup_suspend_resume_ind_value), A_8BIT_MASK,
 			"", HFILL }},
 
-		{ &hf_isup_transmission_medium_requirement,
-			{ "Transmission medium requirement",  "isup.transmission_medium_requirement",
-			FT_UINT8, BASE_DEC, VALS(isup_transmission_medium_requirement_value), 0x0,
-			"", HFILL }},
-
 		{ &hf_isup_range_indicator,
 		        { "Range indicator",  "isup.range_indicator",
 			  FT_UINT8, BASE_DEC, NULL , 0x0,
diff --git a/packet-nlsp.c b/packet-nlsp.c
index d3abbdd76a..1d88c51558 100644
--- a/packet-nlsp.c
+++ b/packet-nlsp.c
@@ -1,7 +1,7 @@
 /* packet-nlsp.c
  * Routines for NetWare Link Services Protocol
  *
- * $Id: packet-nlsp.c,v 1.6 2003/04/20 01:14:42 gerald Exp $
+ * $Id: packet-nlsp.c,v 1.7 2003/10/06 08:35:30 guy Exp $
  *
  * Based on ISIS dissector by Stuart Stanley <stuarts@mxmail.net>
  *
@@ -1591,10 +1591,6 @@ proto_register_nlsp(void)
 	      { "Holding Timer", "nlsp.hello.holding_timer", FT_UINT8, BASE_DEC,
 	        NULL, 0x0, "", HFILL }},
 
-	    { &hf_nlsp_hello_holding_timer,
-	      { "Holding Timer", "nlsp.hello.holding_timer", FT_UINT8, BASE_DEC,
-	        NULL, 0x0, "", HFILL }},
-
 	    { &hf_nlsp_hello_priority,
 	      { "Priority", "nlsp.hello.priority", FT_UINT8, BASE_DEC,
 	        NULL, NLSP_HELLO_PRIORITY_MASK,
diff --git a/packet-ranap.c b/packet-ranap.c
index ae63de8bec..0eada85470 100644
--- a/packet-ranap.c
+++ b/packet-ranap.c
@@ -3,7 +3,7 @@
  * Based on 3GPP TS 25.413 V3.4.0
  * Copyright 2001, Martin Held <Martin.Held@icn.siemens.de>
  *
- * $Id: packet-ranap.c,v 1.19 2003/10/03 23:31:05 guy Exp $
+ * $Id: packet-ranap.c,v 1.20 2003/10/06 08:35:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -4163,12 +4163,6 @@ proto_register_ranap(void)
 	FT_UINT16, BASE_DEC, NULL, 0x0,
 	"", HFILL }
     },
-    { &hf_ranap_number_of_ProtocolExtensionFields,
-      { "Number of Protocol Extension Fields",
-        "ranap.ie.number_of_ProtocolExtensionFields",
-	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL }
-    },
     { &hf_ranap_number_of_ies_in_list,
       { "Number of IEs in list",
         "ranap.number_of_ies",
diff --git a/packet-sua.c b/packet-sua.c
index 91e98c2793..bb3178aa75 100644
--- a/packet-sua.c
+++ b/packet-sua.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002, 2003 Michael Tuexen <tuexen [AT] fh-muenster.de>
  *
- * $Id: packet-sua.c,v 1.20 2003/09/04 13:33:22 tuexen Exp $
+ * $Id: packet-sua.c,v 1.21 2003/10/06 08:35:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1712,7 +1712,6 @@ proto_register_sua(void)
     { &hf_translation_type,                      { "Translation Type",             "sua.global_title_translation_type",             FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
     { &hf_numbering_plan,                        { "Numbering Plan",               "sua.global_title_numbering_plan",               FT_UINT8,   BASE_HEX,  VALS(numbering_plan_values),        0x0,                      "", HFILL } },
     { &hf_nature_of_address,                     { "Nature of Address",            "sua.global_title_nature_of_address",            FT_UINT8,   BASE_HEX,  VALS(nature_of_address_values),     0x0,                      "", HFILL } },
-    { &hf_nature_of_address,                     { "Nature Of Address",            "sua.global_title_nature_of_address",            FT_UINT8,   BASE_HEX,  VALS(nature_of_address_values),     0x0,                      "", HFILL } },
     { &hf_global_title,                          { "Global Title",                 "sua.global_title_signals",                      FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
     { &hf_point_code_dpc,                        { "Point Code",                   "sua.point_code",                                FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
     { &hf_ssn_reserved,                          { "Reserved",                     "sua.ssn_reserved",                              FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },