detect/file: minor code cleanup

Reduce scope where possible. Suggested by cppcheck.

diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index 5a316ceabe6a29f6f81b8ecae7f1464d504a9759..4c15e448d44e6182bb152ed88e16b4a5c1322524 100644 (file)
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -675,10 +675,9 @@ static void PrefilterTxFiledata(DetectEngineThreadCtx *det_ctx,
     const int list_id = ctx->list_id;
 
     FileContainer *ffc = AppLayerParserGetFiles(f, flags);
-    int local_file_id = 0;
     if (ffc != NULL) {
-        File *file = ffc->head;
-        for (; file != NULL; file = file->next) {
+        int local_file_id = 0;
+        for (File *file = ffc->head; file != NULL; file = file->next) {
             if (file->txid != idx)
                 continue;
 

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index 3e829736b6f44fddd2476b197927b90df60219a6..93ac153d86cd38f01f327c33113d99e6ba0bfb3b 100644 (file)
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@@ -537,10 +537,9 @@ static void PrefilterTxFilemagic(DetectEngineThreadCtx *det_ctx,
     const int list_id = ctx->list_id;
 
     FileContainer *ffc = AppLayerParserGetFiles(f, flags);
-    int local_file_id = 0;
     if (ffc != NULL) {
-        File *file = ffc->head;
-        for (; file != NULL; file = file->next) {
+        int local_file_id = 0;
+        for (File *file = ffc->head; file != NULL; file = file->next) {
             if (file->txid != idx)
                 continue;
 

diff --git a/src/detect-filename.c b/src/detect-filename.c
index a19424758f913a568ff2a660e1e9a076c168d08e..63f5085dd3f170459e16e93e31852d258f3ea5c6 100644 (file)
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -443,10 +443,9 @@ static void PrefilterTxFilename(DetectEngineThreadCtx *det_ctx,
     const int list_id = ctx->list_id;
 
     FileContainer *ffc = AppLayerParserGetFiles(f, flags);
-    int local_file_id = 0;
     if (ffc != NULL) {
-        File *file = ffc->head;
-        for (; file != NULL; file = file->next) {
+        int local_file_id = 0;
+        for (File *file = ffc->head; file != NULL; file = file->next) {
             if (file->txid != idx)
                 continue;