output: declare OutputLoggerThreadStore once

diff --git a/src/output-file.c b/src/output-file.c
index e12d0146a9bea9b7de85d7458add718fc0891af4..b05686d32907952ca11b3172f5b4a5b0f2b2a6fa 100644 (file)
--- a/src/output-file.c
+++ b/src/output-file.c
@@ -36,11 +36,6 @@
 
 bool g_file_logger_enabled = false;
 
-typedef struct OutputLoggerThreadStore_ {
-    void *thread_data;
-    struct OutputLoggerThreadStore_ *next;
-} OutputLoggerThreadStore;
-
 /** per thread data for this module, contains a list of per thread
  *  data for the packet loggers. */
 typedef struct OutputLoggerThreadData_ {

diff --git a/src/output-filedata.c b/src/output-filedata.c
index 7d0ead85abfca7d48796f71ebb3a010de00b0d6a..8a990d710d3446d544e86b0abf46a39402b12233 100644 (file)
--- a/src/output-filedata.c
+++ b/src/output-filedata.c
@@ -37,11 +37,6 @@
 
 bool g_filedata_logger_enabled = false;
 
-typedef struct OutputLoggerThreadStore_ {
-    void *thread_data;
-    struct OutputLoggerThreadStore_ *next;
-} OutputLoggerThreadStore;
-
 /** per thread data for this module, contains a list of per thread
  *  data for the packet loggers. */
 typedef struct OutputLoggerThreadData_ {

diff --git a/src/output-flow.c b/src/output-flow.c
index 1dc4ee9102d72a223491b363f496272b6cafa036..cd6440d425fdef26b4ee3280e73445f386283fdb 100644 (file)
--- a/src/output-flow.c
+++ b/src/output-flow.c
@@ -25,15 +25,11 @@
 
 #include "suricata-common.h"
 #include "tm-modules.h"
+#include "output.h"
 #include "output-flow.h"
 #include "util-profiling.h"
 #include "util-validate.h"
 
-typedef struct OutputLoggerThreadStore_ {
-    void *thread_data;
-    struct OutputLoggerThreadStore_ *next;
-} OutputLoggerThreadStore;
-
 /** per thread data for this module, contains a list of per thread
  *  data for the packet loggers. */
 typedef struct OutputLoggerThreadData_ {

diff --git a/src/output-packet.c b/src/output-packet.c
index e18bc4448bd38f911e8cfae88a7abc7f50e4d743..4920cca4f521a54c9449e82714701210f987ea93 100644 (file)
--- a/src/output-packet.c
+++ b/src/output-packet.c
@@ -30,11 +30,6 @@
 #include "util-profiling.h"
 #include "util-validate.h"
 
-typedef struct OutputLoggerThreadStore_ {
-    void *thread_data;
-    struct OutputLoggerThreadStore_ *next;
-} OutputLoggerThreadStore;
-
 /** per thread data for this module, contains a list of per thread
  *  data for the packet loggers. */
 typedef struct OutputLoggerThreadData_ {

diff --git a/src/output-streaming.c b/src/output-streaming.c
index 7cfc0218ec13f9ee8775a9f941fc4522c48503c2..5840217729c709ae0e0ff53de43a73b7e9e3b5a4 100644 (file)
--- a/src/output-streaming.c
+++ b/src/output-streaming.c
@@ -38,11 +38,6 @@
 #include "stream-tcp-reassemble.h"
 #include "util-validate.h"
 
-typedef struct OutputLoggerThreadStore_ {
-    void *thread_data;
-    struct OutputLoggerThreadStore_ *next;
-} OutputLoggerThreadStore;
-
 /** per thread data for this module, contains a list of per thread
  *  data for the packet loggers. */
 typedef struct OutputLoggerThreadData_ {

diff --git a/src/output-tx.c b/src/output-tx.c
index 36996a33f1692ca4ec613f8dbe23e3c9918bf08f..716db16955db477d44f9f256f6d7ac534cab3d4a 100644 (file)
--- a/src/output-tx.c
+++ b/src/output-tx.c
@@ -32,11 +32,6 @@
 #include "util-profiling.h"
 #include "util-validate.h"
 
-typedef struct OutputLoggerThreadStore_ {
-    void *thread_data;
-    struct OutputLoggerThreadStore_ *next;
-} OutputLoggerThreadStore;
-
 /** per thread data for this module, contains a list of per thread
  *  data for the packet loggers. */
 typedef struct OutputLoggerThreadData_ {

diff --git a/src/output.h b/src/output.h
index f9d1a0ada08eb459580b2542110bb33609d099f7..3f73a1bada15e818736137dd14cfb692d1c24f90 100644 (file)
--- a/src/output.h
+++ b/src/output.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2010 Open Information Security Foundation
+/* Copyright (C) 2007-2022 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -40,6 +40,11 @@
 
 #include "util-config.h"
 
+typedef struct OutputLoggerThreadStore_ {
+    void *thread_data;
+    struct OutputLoggerThreadStore_ *next;
+} OutputLoggerThreadStore;
+
 typedef struct OutputInitResult_ {
     OutputCtx *ctx;
     bool ok;