From 34841ab11b1400f506f00c2a538569352858d91f Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Sun, 4 Oct 2026 22:05:44 +0200 Subject: [PATCH] src: do not include "util-optimize.h" directly It is included in suricata-common.h Ticket: 945 --- src/alert-debuglog.c | 1 - src/alert-fastlog.c | 1 - src/alert-syslog.c | 1 - src/decode-sctp.c | 1 - src/decode-tcp.c | 1 - src/detect-engine-register.c | 1 - src/flow.h | 1 - src/output-json-alert.c | 1 - src/output-json-anomaly.c | 1 - src/output-json-frame.c | 1 - src/output-json-metadata.c | 1 - src/output-json.c | 1 - src/source-af-packet.c | 1 - src/source-af-xdp.c | 1 - src/source-pcap.c | 1 - src/tm-threads.c | 1 - src/util-memcmp.h | 1 - 17 files changed, 17 deletions(-) diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c index 7e70982699..6a66b184a6 100644 --- a/src/alert-debuglog.c +++ b/src/alert-debuglog.c @@ -47,7 +47,6 @@ #include "flow-var.h" #include "flow-bit.h" #include "util-var-name.h" -#include "util-optimize.h" #include "util-logopenfile.h" #include "stream-tcp-reassemble.h" diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c index 08b8d56381..2392a65049 100644 --- a/src/alert-fastlog.c +++ b/src/alert-fastlog.c @@ -38,7 +38,6 @@ #include "util-print.h" #include "util-proto-name.h" -#include "util-optimize.h" #include "util-logopenfile.h" #include "suricata.h" diff --git a/src/alert-syslog.c b/src/alert-syslog.c index b6732d0058..abf0a5771c 100644 --- a/src/alert-syslog.c +++ b/src/alert-syslog.c @@ -44,7 +44,6 @@ #include "util-print.h" #include "util-proto-name.h" #include "util-syslog.h" -#include "util-optimize.h" #include "util-logopenfile.h" #include "util-enum.h" #include "action-globals.h" diff --git a/src/decode-sctp.c b/src/decode-sctp.c index 64b67e9ed4..33ac24c0d2 100644 --- a/src/decode-sctp.c +++ b/src/decode-sctp.c @@ -37,7 +37,6 @@ #include "util-validate.h" #include "util-unittest.h" #include "util-debug.h" -#include "util-optimize.h" #include "flow.h" /** diff --git a/src/decode-tcp.c b/src/decode-tcp.c index f2cad13d06..745ab7b1d3 100644 --- a/src/decode-tcp.c +++ b/src/decode-tcp.c @@ -36,7 +36,6 @@ #include "decode-events.h" #include "util-unittest.h" #include "util-debug.h" -#include "util-optimize.h" #include "flow.h" static inline uint16_t DecodeTCPGetU16(const uint8_t *d) diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c index 845521acac..ac4866f9f9 100644 --- a/src/detect-engine-register.c +++ b/src/detect-engine-register.c @@ -255,7 +255,6 @@ #include "util-privs.h" #include "util-profiling.h" #include "util-validate.h" -#include "util-optimize.h" #include "util-path.h" #include "util-mpm-ac.h" #include "runmodes.h" diff --git a/src/flow.h b/src/flow.h index 3158cb3447..de1c0a715a 100644 --- a/src/flow.h +++ b/src/flow.h @@ -32,7 +32,6 @@ typedef struct SCFlowStorageId SCFlowStorageId; #include "util-exception-policy.h" #include "util-exception-policy-types.h" #include "util-var.h" -#include "util-optimize.h" #include "util-validate.h" #include "app-layer-protos.h" #include "flow-bindgen.h" diff --git a/src/output-json-alert.c b/src/output-json-alert.c index 612c128d7b..2b649d2c4c 100644 --- a/src/output-json-alert.c +++ b/src/output-json-alert.c @@ -61,7 +61,6 @@ #include "output-json-frame.h" #include "util-print.h" -#include "util-optimize.h" #include "util-buffer.h" #include "util-reference-config.h" #include "util-validate.h" diff --git a/src/output-json-anomaly.c b/src/output-json-anomaly.c index 3081baeaab..6a318486ac 100644 --- a/src/output-json-anomaly.c +++ b/src/output-json-anomaly.c @@ -52,7 +52,6 @@ #include "util-privs.h" #include "util-print.h" #include "util-proto-name.h" -#include "util-optimize.h" #include "util-buffer.h" #include "util-validate.h" diff --git a/src/output-json-frame.c b/src/output-json-frame.c index eb6ad00eba..bb0909138c 100644 --- a/src/output-json-frame.c +++ b/src/output-json-frame.c @@ -61,7 +61,6 @@ #include "util-privs.h" #include "util-print.h" #include "util-proto-name.h" -#include "util-optimize.h" #include "util-buffer.h" #include "util-validate.h" diff --git a/src/output-json-metadata.c b/src/output-json-metadata.c index 2b93e37407..8723712497 100644 --- a/src/output-json-metadata.c +++ b/src/output-json-metadata.c @@ -58,7 +58,6 @@ #include "util-privs.h" #include "util-print.h" #include "util-proto-name.h" -#include "util-optimize.h" #include "util-buffer.h" #define MODULE_NAME "JsonMetadataLog" diff --git a/src/output-json.c b/src/output-json.c index d661f4916a..fab3821584 100644 --- a/src/output-json.c +++ b/src/output-json.c @@ -49,7 +49,6 @@ #include "util-byte.h" #include "util-print.h" #include "util-proto-name.h" -#include "util-optimize.h" #include "util-buffer.h" #include "util-logopenfile.h" #include "util-log-redis.h" diff --git a/src/source-af-packet.c b/src/source-af-packet.c index 41d08f7aae..eb87c750e8 100644 --- a/src/source-af-packet.c +++ b/src/source-af-packet.c @@ -49,7 +49,6 @@ #include "util-ebpf.h" #include "util-error.h" #include "util-privs.h" -#include "util-optimize.h" #include "util-checksum.h" #include "util-ioctl.h" #include "util-host-info.h" diff --git a/src/source-af-xdp.c b/src/source-af-xdp.c index 7f45e3d0c1..511c406838 100644 --- a/src/source-af-xdp.c +++ b/src/source-af-xdp.c @@ -47,7 +47,6 @@ #include "util-ebpf.h" #include "util-error.h" #include "util-privs.h" -#include "util-optimize.h" #include "util-checksum.h" #include "util-ioctl.h" #include "util-host-info.h" diff --git a/src/source-pcap.c b/src/source-pcap.c index a800aac3ab..af4801e497 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -39,7 +39,6 @@ #include "util-privs.h" #include "util-datalink.h" #include "util-device-private.h" -#include "util-optimize.h" #include "util-checksum.h" #include "util-ioctl.h" #include "tmqh-packetpool.h" diff --git a/src/tm-threads.c b/src/tm-threads.c index 4b269600ac..e8345c7193 100644 --- a/src/tm-threads.c +++ b/src/tm-threads.c @@ -42,7 +42,6 @@ #include "util-debug.h" #include "util-privs.h" #include "util-cpu.h" -#include "util-optimize.h" #include "util-profiling.h" #include "util-signal.h" #include "queue.h" diff --git a/src/util-memcmp.h b/src/util-memcmp.h index 4356e2d2e4..3cd4befa85 100644 --- a/src/util-memcmp.h +++ b/src/util-memcmp.h @@ -30,7 +30,6 @@ #define SURICATA_UTIL_MEMCMP_H #include "suricata-common.h" -#include "util-optimize.h" /** \brief compare two patterns, converting the 2nd to lowercase * \warning *ONLY* the 2nd pattern is converted to lowercase