From: Victor Julien <victor@inliniac.net>
Date: Thu, 25 Jan 2018 10:02:33 +0000 (+0100)
Subject: file: minor cleanups
X-Git-Tag: suricata-4.0.4~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10b53ad597286b73eb1f7b99fe8de12a3653c612;p=thirdparty%2Fsuricata.git

file: minor cleanups
---

diff --git a/src/util-file.c b/src/util-file.c
index af5ffae3ec..2b942e4da9 100644
--- a/src/util-file.c
+++ b/src/util-file.c
@@ -627,9 +627,10 @@ static int FileAppendDataDo(File *ff, const uint8_t *data, uint32_t data_len)
 
     SCLogDebug("appending %"PRIu32" bytes", data_len);
 
-    if (AppendData(ff, data, data_len) != 0) {
+    int r = AppendData(ff, data, data_len);
+    if (r != 0) {
         ff->state = FILE_STATE_ERROR;
-        SCReturnInt(-1);
+        SCReturnInt(r);
     }
 
     SCReturnInt(0);
@@ -936,6 +937,7 @@ int FileCloseFile(FileContainer *ffc, const uint8_t *data,
 
     SCReturnInt(0);
 }
+
 int FileCloseFileById(FileContainer *ffc, uint32_t track_id,
         const uint8_t *data, uint32_t data_len, uint16_t flags)
 {
@@ -948,10 +950,8 @@ int FileCloseFileById(FileContainer *ffc, uint32_t track_id,
     File *ff = ffc->head;
     for ( ; ff != NULL; ff = ff->next) {
         if (track_id == ff->file_track_id) {
-            if (FileCloseFilePtr(ff, data, data_len, flags) == -1) {
-                SCReturnInt(-1);
-            }
-            SCReturnInt(0);
+            int r = FileCloseFilePtr(ff, data, data_len, flags);
+            SCReturnInt(r);
         }
     }
     SCReturnInt(-1);