]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
output/rfb: remove unused function parameters 8965/head
authorPhilippe Antoine <contact@catenacyber.fr>
Mon, 5 Jun 2023 08:03:04 +0000 (10:03 +0200)
committerVictor Julien <vjulien@oisf.net>
Mon, 5 Jun 2023 09:18:17 +0000 (11:18 +0200)
rust/src/rfb/logger.rs
src/output-json-rfb.c

index e670e869cec3cc917bbd6c4d95351107bf6231fe..392b825b19d3bbb06c1245ef30dddd7e6bfc65ad 100644 (file)
@@ -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()
index 285c22ab448249a82c62d9817f47c802c6102856..cc12d2f1bbdc37fbac6c0b62e331fc1f42bd5228 100644 (file)
 
 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;
     }