From 656679b5f6fdcdd624f5ce3a7d6a6405283b75ef Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Sat, 17 Dec 2011 10:05:47 +0000 Subject: Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40234 --- epan/dissectors/packet-zbee-security.c | 4 ++-- epan/dissectors/packet-zbee-zcl.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'epan') diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 8e757695ed..d754c1f4de 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -825,7 +825,7 @@ zbee_sec_make_nonce(zbee_security_packet *packet, guint8 *nonce) *(nonce++) = (guint8)((packet->counter)>>16 & 0xff); *(nonce++) = (guint8)((packet->counter)>>24 & 0xff); /* Next byte is the security control field. */ - *(nonce++) = packet->control; + *(nonce) = packet->control; } /* zbee_sec_make_nonce */ #endif @@ -1145,7 +1145,7 @@ zbee_sec_hash(guint8 *input, guint input_len, guint8 *output) } /* while */ /* Add the 'n'-bit representation of 'l' to the end of the block. */ cipher_in[j++] = ((input_len * 8) >> 8) & 0xff; - cipher_in[j++] = ((input_len * 8) >> 0) & 0xff; + cipher_in[j] = ((input_len * 8) >> 0) & 0xff; /* Process the last cipher block. */ (void)gcry_cipher_setkey(cipher_hd, output, ZBEE_SEC_CONST_BLOCKSIZE); (void)gcry_cipher_encrypt(cipher_hd, output, ZBEE_SEC_CONST_BLOCKSIZE, cipher_in, ZBEE_SEC_CONST_BLOCKSIZE); diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index e710428503..da9e78a248 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -1380,9 +1380,6 @@ static void dissect_zcl_attr_data(tvbuff_t *tvb, proto_tree *tree, guint *offset gdouble attr_double; nstime_t attr_time; - attr_uint = 0; - attr_int = 0; - /* Dissect attribute data type and data */ switch ( data_type ) { case ZBEE_ZCL_NO_DATA: -- cgit v1.2.1