From 7e979f95aaf477e349373423750d46b834c7b243 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Thu, 21 Apr 2011 13:34:43 +0000 Subject: [PATCH] Fix Dead Store (Dead nested assignment) Warning found by Clang svn path=/trunk/; revision=36761 --- epan/dissectors/packet-usb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 281bf55ec0..03802bd566 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1875,7 +1875,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, int type, endpoint; guint8 setup_flag; proto_tree *tree = NULL; - guint32 src_device, dst_device, tmp_addr; + guint32 tmp_addr; static usb_address_t src_addr, dst_addr; /* has to be static due to SET_ADDRESS */ guint32 src_endpoint, dst_endpoint; gboolean is_request=FALSE; @@ -1904,14 +1904,14 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, /* Set up addresses and ports. */ if (is_request) { - src_addr.device = src_device = 0xffffffff; + src_addr.device = 0xffffffff; src_addr.endpoint = src_endpoint = NO_ENDPOINT; - dst_addr.device = dst_device = htolel(tmp_addr); + dst_addr.device = htolel(tmp_addr); dst_addr.endpoint = dst_endpoint = htolel(endpoint); } else { - src_addr.device = src_device = htolel(tmp_addr); + src_addr.device = htolel(tmp_addr); src_addr.endpoint = src_endpoint = htolel(endpoint); - dst_addr.device = dst_device = 0xffffffff; + dst_addr.device = 0xffffffff; dst_addr.endpoint = dst_endpoint = NO_ENDPOINT; }