From: Philippe Antoine <contact@catenacyber.fr>
Date: Mon, 5 Jun 2023 08:03:04 +0000 (+0200)
Subject: output/rfb: remove unused function parameters
X-Git-Tag: suricata-7.0.0-rc2~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8965%2Fhead;p=thirdparty%2Fsuricata.git

output/rfb: remove unused function parameters
---

diff --git a/rust/src/rfb/logger.rs b/rust/src/rfb/logger.rs
index e670e869ce..392b825b19 100644
--- a/rust/src/rfb/logger.rs
+++ b/rust/src/rfb/logger.rs
@@ -19,7 +19,7 @@
 
 use std;
 use std::fmt::Write;
-use super::rfb::{RFBState, RFBTransaction};
+use super::rfb::RFBTransaction;
 use crate::jsonbuilder::{JsonBuilder, JsonError};
 
 fn log_rfb(tx: &RFBTransaction, js: &mut JsonBuilder) -> Result<(), JsonError> {
@@ -113,8 +113,7 @@ fn log_rfb(tx: &RFBTransaction, js: &mut JsonBuilder) -> Result<(), JsonError> {
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn rs_rfb_logger_log(_state: &mut RFBState,
-                                    tx: *mut std::os::raw::c_void,
+pub unsafe extern "C" fn rs_rfb_logger_log(tx: *mut std::os::raw::c_void,
                                     js: &mut JsonBuilder) -> bool {
     let tx = cast_pointer!(tx, RFBTransaction);
     log_rfb(tx, js).is_ok()
diff --git a/src/output-json-rfb.c b/src/output-json-rfb.c
index 285c22ab44..cc12d2f1bb 100644
--- a/src/output-json-rfb.c
+++ b/src/output-json-rfb.c
@@ -48,11 +48,11 @@
 
 bool JsonRFBAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *js)
 {
-    RFBState *state = FlowGetAppState(f);
+    void *state = FlowGetAppState(f);
     if (state) {
         RFBTransaction *tx = AppLayerParserGetTx(f->proto, ALPROTO_RFB, state, tx_id);
         if (tx) {
-            return rs_rfb_logger_log(state, tx, js);
+            return rs_rfb_logger_log(tx, js);
         }
     }
 
@@ -69,7 +69,7 @@ static int JsonRFBLogger(ThreadVars *tv, void *thread_data,
         return TM_ECODE_FAILED;
     }
 
-    if (!rs_rfb_logger_log(NULL, tx, js)) {
+    if (!rs_rfb_logger_log(tx, js)) {
         goto error;
     }