afl: with -Wshadow issues

diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
index 359bd9a076018a9ee0d6b387df03b136a0f43d8f..5dd7c7e591481e8c6e805e1fb493c57fed3e254c 100644 (file)
--- a/src/app-layer-parser.c
+++ b/src/app-layer-parser.c
@@ -1344,8 +1344,8 @@ int AppLayerParserRequestFromFile(AppProto alproto, char *filename)
         int start = 1;
         while (1) {
             int done = 0;
-            size_t result = fread(&buffer, 1, sizeof(buffer), fp);
-            if (result < sizeof(buffer))
+            size_t size = fread(&buffer, 1, sizeof(buffer), fp);
+            if (size < sizeof(buffer))
                 done = 1;
 
             //SCLogInfo("result %u done %d start %d", (uint)result, done, start);
@@ -1361,7 +1361,7 @@ int AppLayerParserRequestFromFile(AppProto alproto, char *filename)
             //PrintRawDataFp(stdout, buffer, result);
 
             (void)AppLayerParserParse(NULL, alp_tctx, f, alproto, flags,
-                                      buffer, result);
+                                      buffer, size);
             if (done)
                 break;
         }
@@ -1421,8 +1421,8 @@ int AppLayerParserFromFile(AppProto alproto, char *filename)
         int flip = 0;
         while (1) {
             int done = 0;
-            size_t result = fread(&buffer, 1, sizeof(buffer), fp);
-            if (result < sizeof(buffer))
+            size_t size = fread(&buffer, 1, sizeof(buffer), fp);
+            if (size < sizeof(buffer))
                 done = 1;
 
             //SCLogInfo("result %u done %d start %d", (uint)result, done, start);
@@ -1445,7 +1445,7 @@ int AppLayerParserFromFile(AppProto alproto, char *filename)
             //PrintRawDataFp(stdout, buffer, result);
 
             (void)AppLayerParserParse(NULL, alp_tctx, f, alproto, flags,
-                                      buffer, result);
+                                      buffer, size);
             if (done)
                 break;
         }

diff --git a/src/decode.c b/src/decode.c
index 209a55080cafc854fd4a1810ae8c324694f82038..58fa61b33879c41320c3b206bc6d7b3e794a86db 100644 (file)
--- a/src/decode.c
+++ b/src/decode.c
@@ -622,13 +622,13 @@ int DecoderParseDataFromFile(char *filename, DecoderFunc Decoder) {
 
         while (1) {
             int done = 0;
-            size_t result = fread(&buffer, 1, sizeof(buffer), fp);
-            if (result < sizeof(buffer))
+            size_t size = fread(&buffer, 1, sizeof(buffer), fp);
+            if (size < sizeof(buffer))
                  done = 1;
 
             Packet *p = PacketGetFromAlloc();
             if (p != NULL) {
-                (void) Decoder (&tv, dtv, p, buffer, result, NULL);
+                (void) Decoder (&tv, dtv, p, buffer, size, NULL);
                 PacketFree(p);
             }
 

diff --git a/src/util-decode-mime.c b/src/util-decode-mime.c
index eb1dcab56659b8b1d8305159147cd4c612d970d9..fcda28c05585927518b03201baa0280bd3ea2cc5 100644 (file)
--- a/src/util-decode-mime.c
+++ b/src/util-decode-mime.c
@@ -2645,11 +2645,11 @@ int MimeParserDataFromFile(char *filename)
 
         while (1) {
             int done = 0;
-            size_t result = fread(&buffer, 1, sizeof(buffer), fp);
-            if (result < sizeof(buffer))
+            size_t size = fread(&buffer, 1, sizeof(buffer), fp);
+            if (size < sizeof(buffer))
                 done = 1;
 
-            (void) MimeDecParseLine(buffer, result, 1, state);
+            (void) MimeDecParseLine(buffer, size, 1, state);
 
             if (done)
                 break;