Remove a bunch more set-but-no-longer-used variables.

svn path=/trunk/; revision=52100

3 files changed, 6 insertions, 18 deletions

diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c
index 7f4d34df48..b71e6f08d7 100644
--- a/epan/dissectors/packet-juniper.c
+++ b/epan/dissectors/packet-juniper.c
@@ -502,7 +502,7 @@ static int
 dissect_juniper_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti, guint8 *flags)
 {
   proto_item *tisub;
-  guint8     direction,l2hdr_presence,proto,ext_type,ext_len;
+  guint8     l2hdr_presence,proto,ext_type,ext_len;
   guint16    ext_total_len,ext_offset=6,hdr_len;
   guint32    magic_number,ext_val;
 
@@ -510,7 +510,6 @@ dissect_juniper_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, prot
 
   magic_number = tvb_get_ntoh24(tvb, 0);
   *flags = tvb_get_guint8(tvb, 3);
-  direction = *flags & JUNIPER_FLAG_PKT_IN;
   l2hdr_presence = *flags & JUNIPER_FLAG_NO_L2;
 
   juniper_subtree = proto_item_add_subtree(ti, ett_juniper);
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index e9bcd4c21f..7b5a013ea2 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -2271,11 +2271,11 @@ dissect_tlv_upstrm_ass_lbl(tvbuff_t *tvb, packet_info *pinfo, guint offset, prot
 /*Dissect IPv4 Interface ID TLV*/
 static void
 dissect_tlv_ipv4_interface_id(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
-{    
+{
     proto_tree *ti, *val_tree, *sub_tree = NULL;
     ti = proto_tree_add_text(tree, tvb, offset, rem, "IPv4 Interface ID");
     val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val);
- 
+
     /*Dissect IPv4 Next/Previous Hop Address*/
     proto_tree_add_item(val_tree, hf_ldp_tlv_ipv4_intID_hop_addr, tvb,offset, 4, ENC_BIG_ENDIAN);
 
@@ -2284,14 +2284,14 @@ dissect_tlv_ipv4_interface_id(tvbuff_t *tvb, packet_info *pinfo, guint offset, p
 
     ti = proto_tree_add_text(val_tree, tvb, offset + 8, rem, "Sub TLV");
     sub_tree = proto_item_add_subtree(ti, ett_ldp_sub_tlv);
-    
+
     if(rem != 20 && rem != 24 && rem != 28 && rem != 29)
     	{
 	    /*rem = 20 >> Length of IP Multicast Tunnel TLV
 	    rem = 29 >> Length of LDP P2MP LSV TLV
 	    rem = 24 >> Length of RSVP-TE P2MP LSP TLV
 	    rem = 28 >> Length of MPLS Context Label TLV*/
-	    
+
 	    proto_item* inv_length;
 	    inv_length = proto_tree_add_item(val_tree, hf_ldp_tlv_inv_length, tvb, offset, rem, ENC_BIG_ENDIAN);
 	    expert_add_info(pinfo, inv_length, &ei_ldp_inv_length);
@@ -2946,7 +2946,6 @@ static void
 dissect_tlv_pw_status(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem)
 {
     proto_tree *ti, *val_tree;
-    guint32     data;
 
     if(rem != 4){
         proto_tree_add_text(tree, tvb, offset, rem,
@@ -2955,7 +2954,6 @@ dissect_tlv_pw_status(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem)
         return;
     }
 
-    data=tvb_get_ntohl(tvb, offset);
     ti = proto_tree_add_item(tree, hf_ldp_tlv_pw_status_data, tvb, offset, rem, ENC_BIG_ENDIAN);
 
     val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val);
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 0ea5597e5e..f834c7d7a8 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -1811,13 +1811,10 @@ dissect_fhandle_data_NETAPP_GX_v3(tvbuff_t* tvb, packet_info *pinfo _U_, proto_t
 {
 	proto_tree *field_tree = NULL;
 	proto_item *tf;
-	guint16     cluster_id;
 	guint16     epoch;
 	guint32     export_id;
 	guint32     export_uid;
 	guint8      flags;
-	guint8      reserved;
-	guint32     local_dsid;
 	guint32     spinfile_id;
 	guint32     spinfile_uid;
 	guint8      utility;
@@ -1859,9 +1856,6 @@ dissect_fhandle_data_NETAPP_GX_v3(tvbuff_t* tvb, packet_info *pinfo _U_, proto_t
 		epoch = tvb_get_letohs(tvb, offset+2);
 		proto_tree_add_uint(tree, hf_nfs3_gxfh_epoch, tvb, offset+2, 2, epoch);
 		/* = spin file handle = */
-		local_dsid   = tvb_get_letohl(tvb, offset+4);
-		cluster_id   = tvb_get_letohs(tvb, offset+8);
-		reserved     = tvb_get_guint8(tvb, offset+10);
 		flags        = tvb_get_guint8(tvb, offset+11);
 		spinfile_id  = tvb_get_letohl(tvb, offset+12);
 		spinfile_uid = tvb_get_letohl(tvb, offset+16);
@@ -1907,9 +1901,6 @@ dissect_fhandle_data_NETAPP_GX_v3(tvbuff_t* tvb, packet_info *pinfo _U_, proto_t
 					   offset+16, 4, spinfile_uid);
 
 		/* = spin file handle (mount point) = */
-		local_dsid   = tvb_get_letohl(tvb, offset+20);
-		cluster_id   = tvb_get_letohs(tvb, offset+24);
-		reserved     = tvb_get_guint8(tvb, offset+26);
 		flags        = tvb_get_guint8(tvb, offset+27);
 		spinfile_id  = tvb_get_letohl(tvb, offset+28);
 		spinfile_uid = tvb_get_letohl(tvb, offset+32);
@@ -2226,7 +2217,7 @@ dissect_fhandle_data_CELERRA_VNX(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tr
 	} else if (fhlen == 40) {
 		/*
 		If fhlen = 40, it's an NFSv4 file handle).  In Celerra|VNX NFSv4 file handles,
-		the first 4 bytes hold the Named Attribute ID, and the next 4 bytes hold the 
+		the first 4 bytes hold the Named Attribute ID, and the next 4 bytes hold the
 		RO_Node boolean which if true, the file/dir is Read Only. Unlike NFSv3 file
 		handles where the file/dir info precedes the export info, the next 16 bytes contain
 		the *export* info followed by 16 bytes containing the *file/dir* info.