From 006cd5ae3681c6d4bd6718e113e070dcb2f4b825 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 13 Nov 2015 10:38:21 +0100
Subject: [PATCH] file: sync file and tx id types

---
 src/util-file.c | 4 ++--
 src/util-file.h | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/util-file.c b/src/util-file.c
index bfb68e1e03..66d4080e66 100644
--- a/src/util-file.c
+++ b/src/util-file.c
@@ -873,7 +873,7 @@ void FileDisableStoringForTransaction(Flow *f, uint8_t direction, uint64_t tx_id
  *  \param fc file store
  *  \param file_id the file's id
  */
-void FileStoreFileById(FileContainer *fc, uint16_t file_id)
+void FileStoreFileById(FileContainer *fc, uint32_t file_id)
 {
     File *ptr = NULL;
 
@@ -888,7 +888,7 @@ void FileStoreFileById(FileContainer *fc, uint16_t file_id)
     }
 }
 
-void FileStoreAllFilesForTx(FileContainer *fc, uint16_t tx_id)
+void FileStoreAllFilesForTx(FileContainer *fc, uint64_t tx_id)
 {
     File *ptr = NULL;
 
diff --git a/src/util-file.h b/src/util-file.h
index 9cfc3a8593..8f322a99d7 100644
--- a/src/util-file.h
+++ b/src/util-file.h
@@ -62,7 +62,7 @@ typedef struct FileData_ {
 typedef struct File_ {
     uint16_t flags;
     uint64_t txid;                  /**< tx this file is part of */
-    unsigned int file_id;
+    uint32_t file_id;
     uint8_t *name;
     uint16_t name_len;
     int16_t state;
@@ -169,7 +169,7 @@ void FileDisableFilesize(Flow *f, uint8_t direction);
  */
 void FileDisableStoringForTransaction(Flow *f, uint8_t direction, uint64_t tx_id);
 
-void FlowFileDisableStoringForTransaction(struct Flow_ *f, uint16_t tx_id);
+void FlowFileDisableStoringForTransaction(struct Flow_ *f, uint64_t tx_id);
 void FilePrune(FileContainer *ffc);
 
 
@@ -184,8 +184,8 @@ int FileForceMd5(void);
 void FileForceTrackingEnable(void);
 
 void FileStoreAllFiles(FileContainer *);
-void FileStoreAllFilesForTx(FileContainer *, uint16_t);
-void FileStoreFileById(FileContainer *fc, uint16_t);
+void FileStoreAllFilesForTx(FileContainer *, uint64_t);
+void FileStoreFileById(FileContainer *fc, uint32_t);
 
 void FileTruncateAllOpenFiles(FileContainer *);
 
-- 
2.47.2