From a8095bd8d68b7de7dd140f0c8b67d0c6e085ea8f Mon Sep 17 00:00:00 2001
From: Anoop Saldanha <poonaatsoc@gmail.com>
Date: Tue, 27 Mar 2012 17:40:15 +0530
Subject: [PATCH] fix compiler warnings

---
 src/tmqh-flow.c         |  9 ++++++---
 src/util-hash-lookup3.c | 10 ++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/tmqh-flow.c b/src/tmqh-flow.c
index 91022e1d99..81748e44b3 100644
--- a/src/tmqh-flow.c
+++ b/src/tmqh-flow.c
@@ -363,6 +363,7 @@ static int TmqhOutputFlowSetupCtxTest01(void)
 {
     int retval = 0;
     Tmq *tmq = NULL;
+    TmqhFlowCtx *fctx = NULL;
 
     TmqResetQueues();
 
@@ -385,7 +386,7 @@ static int TmqhOutputFlowSetupCtxTest01(void)
     if (ctx == NULL)
         goto end;
 
-    TmqhFlowCtx *fctx = (TmqhFlowCtx *)ctx;
+    fctx = (TmqhFlowCtx *)ctx;
 
     if (fctx->size != 4)
         goto end;
@@ -414,6 +415,7 @@ static int TmqhOutputFlowSetupCtxTest02(void)
 {
     int retval = 0;
     Tmq *tmq = NULL;
+    TmqhFlowCtx *fctx = NULL;
 
     TmqResetQueues();
 
@@ -436,7 +438,7 @@ static int TmqhOutputFlowSetupCtxTest02(void)
     if (ctx == NULL)
         goto end;
 
-    TmqhFlowCtx *fctx = (TmqhFlowCtx *)ctx;
+    fctx = (TmqhFlowCtx *)ctx;
 
     if (fctx->size != 1)
         goto end;
@@ -458,6 +460,7 @@ end:
 static int TmqhOutputFlowSetupCtxTest03(void)
 {
     int retval = 0;
+    TmqhFlowCtx *fctx = NULL;
 
     TmqResetQueues();
 
@@ -467,7 +470,7 @@ static int TmqhOutputFlowSetupCtxTest03(void)
     if (ctx == NULL)
         goto end;
 
-    TmqhFlowCtx *fctx = (TmqhFlowCtx *)ctx;
+    fctx = (TmqhFlowCtx *)ctx;
 
     if (fctx->size != 4)
         goto end;
diff --git a/src/util-hash-lookup3.c b/src/util-hash-lookup3.c
index b33fa22ff8..f765521d6e 100644
--- a/src/util-hash-lookup3.c
+++ b/src/util-hash-lookup3.c
@@ -290,7 +290,6 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
   u.ptr = key;
   if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
     const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
 
     /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
     while (length > 12)
@@ -334,7 +333,8 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
 
 #else /* make valgrind happy */
 
-    k8 = (const uint8_t *)k;
+    const uint8_t  *k8 = (const uint8_t *)k;
+
     switch(length)
     {
     case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
@@ -475,7 +475,6 @@ void hashlittle2(
   u.ptr = key;
   if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
     const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
 
     /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
     while (length > 12)
@@ -519,7 +518,7 @@ void hashlittle2(
 
 #else /* make valgrind happy */
 
-    k8 = (const uint8_t *)k;
+    const uint8_t  *k8 = (const uint8_t *)k;
     switch(length)
     {
     case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
@@ -652,7 +651,6 @@ uint32_t hashbig( const void *key, size_t length, uint32_t initval)
   u.ptr = key;
   if (HASH_BIG_ENDIAN && ((u.i & 0x3) == 0)) {
     const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
 
     /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
     while (length > 12)
@@ -696,7 +694,7 @@ uint32_t hashbig( const void *key, size_t length, uint32_t initval)
 
 #else  /* make valgrind happy */
 
-    k8 = (const uint8_t *)k;
+    const uint8_t  *k8 = (const uint8_t *)k;
     switch(length)                   /* all the case statements fall through */
     {
     case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;