diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c index 359bd9a076..5dd7c7e591 100644 --- 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 209a55080c..58fa61b338 100644 --- 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 eb1dcab566..fcda28c055 100644 --- 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;