From 9ed5b4c0022fc803cd3fd8f7d6ec779800143cd9 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Tue, 25 Feb 2025 10:15:57 -0600 Subject: [PATCH] smtp: remove SCMimeSmtpConfigExtractUrlsSchemeReset It doesn't appear to be needed. The vec being cleared is only set once per run, so never needs to be cleared. Removes one point where we have to supress the static_mut_refs compiler warning. Ticket: #7417 --- rust/src/mime/smtp.rs | 5 ----- src/app-layer-smtp.c | 2 -- 2 files changed, 7 deletions(-) diff --git a/rust/src/mime/smtp.rs b/rust/src/mime/smtp.rs index a937251c00..5dddbe0b10 100644 --- a/rust/src/mime/smtp.rs +++ b/rust/src/mime/smtp.rs @@ -742,11 +742,6 @@ pub unsafe extern "C" fn SCMimeSmtpConfigHeaderValueDepth(val: u32) { MIME_SMTP_CONFIG_HEADER_VALUE_DEPTH = val; } -#[no_mangle] -pub unsafe extern "C" fn SCMimeSmtpConfigExtractUrlsSchemeReset() { - MIME_SMTP_CONFIG_EXTRACT_URL_SCHEMES.clear(); -} - #[no_mangle] pub unsafe extern "C" fn SCMimeSmtpConfigExtractUrlsSchemeAdd( str: *const std::os::raw::c_char, diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c index 472ef7b040..47c365f389 100644 --- a/src/app-layer-smtp.c +++ b/src/app-layer-smtp.c @@ -356,7 +356,6 @@ static void SMTPConfigure(void) { if (extract_urls_schemes) { ConfNode *scheme = NULL; - SCMimeSmtpConfigExtractUrlsSchemeReset(); TAILQ_FOREACH (scheme, &extract_urls_schemes->head, next) { size_t scheme_len = strlen(scheme->val); if (scheme_len > UINT16_MAX - SCHEME_SUFFIX_LEN) { @@ -383,7 +382,6 @@ static void SMTPConfigure(void) { } else { /* Add default extract url scheme 'http' since * extract-urls-schemes wasn't found in the config */ - SCMimeSmtpConfigExtractUrlsSchemeReset(); SCMimeSmtpConfigExtractUrlsSchemeAdd("http://"); }