From 643f25280bdf01e44566bda23c328f43b6fe6911 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 27 Sep 2023 12:23:23 +0200 Subject: [PATCH] detect/app-layer-events: constify arguments; minor cleanups --- src/app-layer-events.h | 7 +++---- src/detect-app-layer-event.c | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app-layer-events.h b/src/app-layer-events.h index 83cb0d9ba4..8b0dc8276d 100644 --- a/src/app-layer-events.h +++ b/src/app-layer-events.h @@ -59,15 +59,14 @@ int AppLayerGetEventInfoById(int event_id, const char **event_name, AppLayerEventType *event_type); void AppLayerDecoderEventsSetEventRaw(AppLayerDecoderEvents **sevents, uint8_t event); -static inline int AppLayerDecoderEventsIsEventSet(AppLayerDecoderEvents *devents, - uint8_t event) +static inline int AppLayerDecoderEventsIsEventSet( + const AppLayerDecoderEvents *devents, uint8_t event) { if (devents == NULL) return 0; - int i; int cnt = devents->cnt; - for (i = 0; i < cnt; i++) { + for (int i = 0; i < cnt; i++) { if (devents->events[i] == event) return 1; } diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c index d5eb011721..9c323359b5 100644 --- a/src/detect-app-layer-event.c +++ b/src/detect-app-layer-event.c @@ -92,14 +92,14 @@ static uint8_t DetectEngineAptEventInspect(DetectEngineCtx *de_ctx, DetectEngine { int r = 0; const AppProto alproto = f->alproto; - AppLayerDecoderEvents *decoder_events = - AppLayerParserGetEventsByTx(f->proto, alproto, tx); + const AppLayerDecoderEvents *decoder_events = + AppLayerParserGetEventsByTx(f->proto, alproto, tx); if (decoder_events == NULL) { goto end; } - SigMatchData *smd = engine->smd; + const SigMatchData *smd = engine->smd; while (1) { - DetectAppLayerEventData *aled = (DetectAppLayerEventData *)smd->ctx; + const DetectAppLayerEventData *aled = (const DetectAppLayerEventData *)smd->ctx; KEYWORD_PROFILING_START; if (AppLayerDecoderEventsIsEventSet(decoder_events, aled->event_id)) { -- 2.47.2