[-Wunused-but-set-variable]

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

6 files changed, 11 insertions, 19 deletions

diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index d9390b3c47..977f0f49ef 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -1108,7 +1108,7 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
     gboolean pc, ind;
     gint32 tag;
     guint32 len;
-    guint16 name_major;
+    /*guint16 name_major;*/
     guint16 name_minor;
     int end_offset;
     tvbuff_t *next_tvb;
@@ -1127,7 +1127,7 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 
     next_tvb = tvb_new_subset(tvb, offset , len , len );
-    name_major = packageandid >> 16;
+    /*name_major = packageandid >> 16;*/
     name_minor = packageandid & 0xffff;
 
     pkg = (curr_info.pkg) ? curr_info.pkg : &no_package;
diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c
index b6d5979e55..f786949a6f 100644
--- a/asn1/inap/packet-inap-template.c
+++ b/asn1/inap/packet-inap-template.c
@@ -128,12 +128,9 @@ dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
     proto_item		*item=NULL;
     proto_tree		*tree=NULL;
 	int				offset = 0;
-	guint			length;
 	asn1_ctx_t asn1_ctx;
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
-	length = tvb_length(tvb);
-
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP");
 
     /* create display subtree for the protocol */
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 58337ca866..c4518ca3d7 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -137,7 +137,6 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
 	gint32     opcode_lcl = 0;
 	const gchar *opname = NULL;
 	const gchar *suffix = NULL;
-	int offset = 0;
 	new_dissector_t opdissector = NULL;
 	const value_string *lookup;
 	proto_item *item=NULL;
@@ -196,7 +195,7 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
 					col_append_str(pinfo->cinfo, COL_INFO, suffix);
 			}
 
-			offset = (*opdissector)(tvb, pinfo, ros_tree);
+			(*opdissector)(tvb, pinfo, ros_tree);
 
 			return TRUE;
 		}
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 5974dd3731..151a36af40 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -1585,7 +1585,7 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
     gboolean pc, ind;
     gint32 tag;
     guint32 len;
-    guint16 name_major;
+    /*guint16 name_major;*/
     guint16 name_minor;
     int end_offset;
     tvbuff_t *next_tvb;
@@ -1604,7 +1604,7 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 
     next_tvb = tvb_new_subset(tvb, offset , len , len );
-    name_major = packageandid >> 16;
+    /*name_major = packageandid >> 16;*/
     name_minor = packageandid & 0xffff;
 
     pkg = (curr_info.pkg) ? curr_info.pkg : &no_package;
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 89759fbbbb..153a022ca2 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -9353,12 +9353,9 @@ dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
     proto_item		*item=NULL;
     proto_tree		*tree=NULL;
 	int				offset = 0;
-	guint			length;
 	asn1_ctx_t asn1_ctx;
 	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
-	length = tvb_length(tvb);
-
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP");
 
     /* create display subtree for the protocol */
@@ -11669,7 +11666,7 @@ void proto_register_inap(void) {
         "InvokeId_present", HFILL }},
 
 /*--- End of included file: packet-inap-hfarr.c ---*/
-#line 203 "../../asn1/inap/packet-inap-template.c"
+#line 200 "../../asn1/inap/packet-inap-template.c"
   };
 
 
@@ -11923,7 +11920,7 @@ void proto_register_inap(void) {
     &ett_inap_InvokeId,
 
 /*--- End of included file: packet-inap-ettarr.c ---*/
-#line 216 "../../asn1/inap/packet-inap-template.c"
+#line 213 "../../asn1/inap/packet-inap-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index 3966392b3c..db2fab5b7b 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -191,7 +191,6 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
 	gint32     opcode_lcl = 0;
 	const gchar *opname = NULL;
 	const gchar *suffix = NULL;
-	int offset = 0;
 	new_dissector_t opdissector = NULL;
 	const value_string *lookup;
 	proto_item *item=NULL;
@@ -250,7 +249,7 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
 					col_append_str(pinfo->cinfo, COL_INFO, suffix);
 			}
 
-			offset = (*opdissector)(tvb, pinfo, ros_tree);
+			(*opdissector)(tvb, pinfo, ros_tree);
 
 			return TRUE;
 		}
@@ -1013,7 +1012,7 @@ dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
 
 
 /*--- End of included file: packet-ros-fn.c ---*/
-#line 372 "../../asn1/ros/packet-ros-template.c"
+#line 371 "../../asn1/ros/packet-ros-template.c"
 
 /*
 * Dissect ROS PDUs inside a PPDU.
@@ -1245,7 +1244,7 @@ void proto_register_ros(void) {
         "OBJECT_IDENTIFIER", HFILL }},
 
 /*--- End of included file: packet-ros-hfarr.c ---*/
-#line 491 "../../asn1/ros/packet-ros-template.c"
+#line 490 "../../asn1/ros/packet-ros-template.c"
   };
 
   /* List of subtrees */
@@ -1266,7 +1265,7 @@ void proto_register_ros(void) {
     &ett_ros_Code,
 
 /*--- End of included file: packet-ros-ettarr.c ---*/
-#line 498 "../../asn1/ros/packet-ros-template.c"
+#line 497 "../../asn1/ros/packet-ros-template.c"
   };
 
   /* Register protocol */