afl: with -Wshadow issues

pull/2549/head
Victor Julien 9 years ago
parent ecf59be413
commit c89ce17017

@ -1344,8 +1344,8 @@ int AppLayerParserRequestFromFile(AppProto alproto, char *filename)
int start = 1; int start = 1;
while (1) { while (1) {
int done = 0; int done = 0;
size_t result = fread(&buffer, 1, sizeof(buffer), fp); size_t size = fread(&buffer, 1, sizeof(buffer), fp);
if (result < sizeof(buffer)) if (size < sizeof(buffer))
done = 1; done = 1;
//SCLogInfo("result %u done %d start %d", (uint)result, done, start); //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); //PrintRawDataFp(stdout, buffer, result);
(void)AppLayerParserParse(NULL, alp_tctx, f, alproto, flags, (void)AppLayerParserParse(NULL, alp_tctx, f, alproto, flags,
buffer, result); buffer, size);
if (done) if (done)
break; break;
} }
@ -1421,8 +1421,8 @@ int AppLayerParserFromFile(AppProto alproto, char *filename)
int flip = 0; int flip = 0;
while (1) { while (1) {
int done = 0; int done = 0;
size_t result = fread(&buffer, 1, sizeof(buffer), fp); size_t size = fread(&buffer, 1, sizeof(buffer), fp);
if (result < sizeof(buffer)) if (size < sizeof(buffer))
done = 1; done = 1;
//SCLogInfo("result %u done %d start %d", (uint)result, done, start); //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); //PrintRawDataFp(stdout, buffer, result);
(void)AppLayerParserParse(NULL, alp_tctx, f, alproto, flags, (void)AppLayerParserParse(NULL, alp_tctx, f, alproto, flags,
buffer, result); buffer, size);
if (done) if (done)
break; break;
} }

@ -622,13 +622,13 @@ int DecoderParseDataFromFile(char *filename, DecoderFunc Decoder) {
while (1) { while (1) {
int done = 0; int done = 0;
size_t result = fread(&buffer, 1, sizeof(buffer), fp); size_t size = fread(&buffer, 1, sizeof(buffer), fp);
if (result < sizeof(buffer)) if (size < sizeof(buffer))
done = 1; done = 1;
Packet *p = PacketGetFromAlloc(); Packet *p = PacketGetFromAlloc();
if (p != NULL) { if (p != NULL) {
(void) Decoder (&tv, dtv, p, buffer, result, NULL); (void) Decoder (&tv, dtv, p, buffer, size, NULL);
PacketFree(p); PacketFree(p);
} }

@ -2645,11 +2645,11 @@ int MimeParserDataFromFile(char *filename)
while (1) { while (1) {
int done = 0; int done = 0;
size_t result = fread(&buffer, 1, sizeof(buffer), fp); size_t size = fread(&buffer, 1, sizeof(buffer), fp);
if (result < sizeof(buffer)) if (size < sizeof(buffer))
done = 1; done = 1;
(void) MimeDecParseLine(buffer, result, 1, state); (void) MimeDecParseLine(buffer, size, 1, state);
if (done) if (done)
break; break;

Loading…
Cancel
Save