forked from osmocom/wireshark
Fix Dead Store (Dead nested assignment) Warning found by Clang
svn path=/trunk/; revision=36761
This commit is contained in:
parent
7239db18ec
commit
7e979f95aa
|
@ -1875,7 +1875,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
|
||||||
int type, endpoint;
|
int type, endpoint;
|
||||||
guint8 setup_flag;
|
guint8 setup_flag;
|
||||||
proto_tree *tree = NULL;
|
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 */
|
static usb_address_t src_addr, dst_addr; /* has to be static due to SET_ADDRESS */
|
||||||
guint32 src_endpoint, dst_endpoint;
|
guint32 src_endpoint, dst_endpoint;
|
||||||
gboolean is_request=FALSE;
|
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. */
|
/* Set up addresses and ports. */
|
||||||
if (is_request) {
|
if (is_request) {
|
||||||
src_addr.device = src_device = 0xffffffff;
|
src_addr.device = 0xffffffff;
|
||||||
src_addr.endpoint = src_endpoint = NO_ENDPOINT;
|
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);
|
dst_addr.endpoint = dst_endpoint = htolel(endpoint);
|
||||||
} else {
|
} else {
|
||||||
src_addr.device = src_device = htolel(tmp_addr);
|
src_addr.device = htolel(tmp_addr);
|
||||||
src_addr.endpoint = src_endpoint = htolel(endpoint);
|
src_addr.endpoint = src_endpoint = htolel(endpoint);
|
||||||
dst_addr.device = dst_device = 0xffffffff;
|
dst_addr.device = 0xffffffff;
|
||||||
dst_addr.endpoint = dst_endpoint = NO_ENDPOINT;
|
dst_addr.endpoint = dst_endpoint = NO_ENDPOINT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue