From 24c2702a0579f86529053db7ae3145cf7c421836 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Mon, 5 Jun 2023 10:01:33 +0200 Subject: [PATCH] output/mqtt: remove unused function parameters --- rust/src/mqtt/logger.rs | 4 ++-- src/output-json-mqtt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/src/mqtt/logger.rs b/rust/src/mqtt/logger.rs index 09b14fe25d..af0db17bc2 100644 --- a/rust/src/mqtt/logger.rs +++ b/rust/src/mqtt/logger.rs @@ -17,7 +17,7 @@ // written by Sascha Steinbiss -use super::mqtt::{MQTTState, MQTTTransaction}; +use super::mqtt::MQTTTransaction; use crate::jsonbuilder::{JsonBuilder, JsonError}; use crate::mqtt::mqtt_message::{MQTTOperation, MQTTSubscribeTopicData}; use crate::mqtt::parser::FixedHeader; @@ -298,7 +298,7 @@ fn log_mqtt(tx: &MQTTTransaction, flags: u32, js: &mut JsonBuilder) -> Result<() #[no_mangle] pub unsafe extern "C" fn rs_mqtt_logger_log( - _state: &mut MQTTState, tx: *mut std::os::raw::c_void, flags: u32, js: &mut JsonBuilder, + tx: *mut std::os::raw::c_void, flags: u32, js: &mut JsonBuilder, ) -> bool { let tx = cast_pointer!(tx, MQTTTransaction); log_mqtt(tx, flags, js).is_ok() diff --git a/src/output-json-mqtt.c b/src/output-json-mqtt.c index 7b3ca62131..9ea8905080 100644 --- a/src/output-json-mqtt.c +++ b/src/output-json-mqtt.c @@ -65,7 +65,7 @@ bool JsonMQTTAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *js) if (state) { MQTTTransaction *tx = AppLayerParserGetTx(f->proto, ALPROTO_MQTT, state, tx_id); if (tx) { - return rs_mqtt_logger_log(state, tx, MQTT_DEFAULTS, js); + return rs_mqtt_logger_log(tx, MQTT_DEFAULTS, js); } } @@ -89,7 +89,7 @@ static int JsonMQTTLogger(ThreadVars *tv, void *thread_data, return TM_ECODE_FAILED; } - if (!rs_mqtt_logger_log(state, tx, thread->mqttlog_ctx->flags, js)) + if (!rs_mqtt_logger_log(tx, thread->mqttlog_ctx->flags, js)) goto error; OutputJsonBuilderBuffer(js, thread->ctx);