From 171bec042e97005eaec05bdeb8b5b8f2af7b8dc0 Mon Sep 17 00:00:00 2001 From: Stephen Donnelly Date: Wed, 10 Jan 2024 16:39:34 +1300 Subject: [PATCH] source/erf-dag: compiler warnings Bug: #6667. Fix compiler warnings for function pointer parameters missing const with --enable-dag --- src/source-erf-dag.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/source-erf-dag.c b/src/source-erf-dag.c index b7ea14d83239..ebac89e2d8b9 100644 --- a/src/source-erf-dag.c +++ b/src/source-erf-dag.c @@ -118,10 +118,10 @@ static inline TmEcode ProcessErfDagRecords(ErfDagThreadVars *ewtn, uint8_t *top, uint32_t *pkts_read); static inline TmEcode ProcessErfDagRecord(ErfDagThreadVars *ewtn, char *prec); TmEcode ReceiveErfDagLoop(ThreadVars *, void *data, void *slot); -TmEcode ReceiveErfDagThreadInit(ThreadVars *, void *, void **); +TmEcode ReceiveErfDagThreadInit(ThreadVars *, const void *, void **); void ReceiveErfDagThreadExitStats(ThreadVars *, void *); TmEcode ReceiveErfDagThreadDeinit(ThreadVars *, void *); -TmEcode DecodeErfDagThreadInit(ThreadVars *, void *, void **); +TmEcode DecodeErfDagThreadInit(ThreadVars *, const void *, void **); TmEcode DecodeErfDagThreadDeinit(ThreadVars *tv, void *data); TmEcode DecodeErfDag(ThreadVars *, Packet *, void *); void ReceiveErfDagCloseStream(int dagfd, int stream); @@ -175,8 +175,7 @@ TmModuleDecodeErfDagRegister(void) * \param data data pointer gets populated with * */ -TmEcode -ReceiveErfDagThreadInit(ThreadVars *tv, void *initdata, void **data) +TmEcode ReceiveErfDagThreadInit(ThreadVars *tv, const void *initdata, void **data) { SCEnter(); int stream_count = 0; @@ -196,14 +195,14 @@ ReceiveErfDagThreadInit(ThreadVars *tv, void *initdata, void **data) */ if (dag_parse_name(initdata, ewtn->dagname, DAGNAME_BUFSIZE, &ewtn->dagstream) < 0) { - SCLogError("Failed to parse DAG interface: %s", (char *)initdata); + SCLogError("Failed to parse DAG interface: %s", (const char *)initdata); SCFree(ewtn); exit(EXIT_FAILURE); } ewtn->livedev = LiveGetDevice(initdata); if (ewtn->livedev == NULL) { - SCLogError("Unable to get %s live device", (char *)initdata); + SCLogError("Unable to get %s live device", (const char *)initdata); SCFree(ewtn); SCReturnInt(TM_ECODE_FAILED); } @@ -612,8 +611,7 @@ DecodeErfDag(ThreadVars *tv, Packet *p, void *data) SCReturnInt(TM_ECODE_OK); } -TmEcode -DecodeErfDagThreadInit(ThreadVars *tv, void *initdata, void **data) +TmEcode DecodeErfDagThreadInit(ThreadVars *tv, const void *initdata, void **data) { SCEnter(); DecodeThreadVars *dtv = NULL;