From b82e71b95eb274959d2d942a09a9470d0e9097ca Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 22 Nov 2019 16:32:43 +0100 Subject: [PATCH] files: remove FILE_USE_TRACKID flag Once it was optional but as it no longer is it is no longer useful. Remove it. --- src/util-file.c | 1 - src/util-file.h | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/util-file.c b/src/util-file.c index 0c1e228854..88a53d1357 100644 --- a/src/util-file.c +++ b/src/util-file.c @@ -872,7 +872,6 @@ int FileOpenFileWithId(FileContainer *ffc, const StreamingBufferConfig *sbcfg, return -1; ff->file_track_id = track_id; - ff->flags |= FILE_USE_TRACKID; return 0; } diff --git a/src/util-file.h b/src/util-file.h index ef8b034018..e8077d15ed 100644 --- a/src/util-file.h +++ b/src/util-file.h @@ -47,7 +47,6 @@ #define FILE_STORED BIT_U16(11) #define FILE_NOTRACK BIT_U16(12) /**< track size of file */ #define FILE_USE_DETECT BIT_U16(13) /**< use content_inspected tracker */ -#define FILE_USE_TRACKID BIT_U16(14) /**< File::file_track_id field is in use */ #define FILE_HAS_GAPS BIT_U16(15) typedef enum FileState_ { @@ -67,8 +66,7 @@ typedef struct File_ { FileState state; StreamingBuffer *sb; uint64_t txid; /**< tx this file is part of */ - uint32_t file_track_id; /**< id used by protocol parser. Optional - * only used if FILE_USE_TRACKID flag set */ + uint32_t file_track_id; /**< id used by protocol parser */ uint32_t file_store_id; /**< id used in store file name file. */ int fd; /**< file descriptor for filestore, not open if equal to -1 */ -- 2.47.2