From cea917c38c5cc20387aea9a12ce754b45b57a96f Mon Sep 17 00:00:00 2001
From: Juliana Fajardini <jufajardini@oisf.net>
Date: Wed, 10 Apr 2024 18:38:14 -0300
Subject: [PATCH] app-layer: fix minor typo and formatting in LogInfo

Also update copyright years.
---
 src/app-layer-enip.c | 6 ++----
 src/app-layer-ftp.c  | 5 ++---
 src/app-layer-htp.c  | 5 ++---
 src/app-layer-smtp.c | 5 ++---
 src/app-layer-ssl.c  | 7 +++----
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/app-layer-enip.c b/src/app-layer-enip.c
index f059774b6d..2fbe898d4e 100644
--- a/src/app-layer-enip.c
+++ b/src/app-layer-enip.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Open Information Security Foundation
+/* Copyright (C) 2015-2024 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -562,9 +562,7 @@ void RegisterENIPUDPParsers(void)
                 IPPROTO_UDP, ALPROTO_ENIP, STREAM_TOSERVER | STREAM_TOCLIENT);
     } else
     {
-        SCLogInfo(
-                "Parsed disabled for %s protocol. Protocol detection" "still on.",
-                proto_name);
+        SCLogInfo("Parser disabled for %s protocol. Protocol detection still on.", proto_name);
     }
 
 #ifdef UNITTESTS
diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c
index 8925d6dd6a..c1e8b1646e 100644
--- a/src/app-layer-ftp.c
+++ b/src/app-layer-ftp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2022 Open Information Security Foundation
+/* Copyright (C) 2007-2024 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -1355,8 +1355,7 @@ void RegisterFTPParsers(void)
 
         FTPParseMemcap();
     } else {
-        SCLogInfo("Parsed disabled for %s protocol. Protocol detection"
-                  "still on.", proto_name);
+        SCLogInfo("Parser disabled for %s protocol. Protocol detection still on.", proto_name);
     }
 
     FTPSetMpmState();
diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index 1b4d31c841..c240a817b8 100644
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2020 Open Information Security Foundation
+/* Copyright (C) 2007-2024 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -3281,8 +3281,7 @@ void RegisterHTPParsers(void)
         /* app-layer-frame-documentation tag end: registering relevant callbacks */
         HTPConfigure();
     } else {
-        SCLogInfo("Parsed disabled for %s protocol. Protocol detection"
-                  "still on.", proto_name);
+        SCLogInfo("Parser disabled for %s protocol. Protocol detection still on.", proto_name);
     }
 #ifdef UNITTESTS
     AppLayerParserRegisterProtocolUnittests(IPPROTO_TCP, ALPROTO_HTTP1, HTPParserRegisterTests);
diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c
index 469ea4740a..b9e0297883 100644
--- a/src/app-layer-smtp.c
+++ b/src/app-layer-smtp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2021 Open Information Security Foundation
+/* Copyright (C) 2007-2024 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -1902,8 +1902,7 @@ void RegisterSMTPParsers(void)
         AppLayerParserRegisterStateDataFunc(IPPROTO_TCP, ALPROTO_SMTP, SMTPGetStateData);
         AppLayerParserRegisterStateProgressCompletionStatus(ALPROTO_SMTP, 1, 1);
     } else {
-        SCLogInfo("Parsed disabled for %s protocol. Protocol detection"
-                  "still on.", proto_name);
+        SCLogInfo("Parser disabled for %s protocol. Protocol detection still on.", proto_name);
     }
 
     SMTPSetMpmState();
diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c
index cb094f3801..52810f731d 100644
--- a/src/app-layer-ssl.c
+++ b/src/app-layer-ssl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2022 Open Information Security Foundation
+/* Copyright (C) 2007-2024 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -1018,7 +1018,7 @@ static inline int TLSDecodeHSHelloExtensionSupportedVersions(SSLState *ssl_state
         if (!(HAS_SPACE(supported_ver_len)))
             goto invalid_length;
 
-        /* Use the first (and prefered) valid version as client version,
+        /* Use the first (and preferred) valid version as client version,
          * skip over GREASE and other possible noise. */
         uint16_t i = 0;
         while (i + 1 < (uint16_t)supported_ver_len) {
@@ -3074,8 +3074,7 @@ void RegisterSSLParsers(void)
             }
         }
     } else {
-        SCLogConfig("Parsed disabled for %s protocol. Protocol detection"
-                  "still on.", proto_name);
+        SCLogConfig("Parser disabled for %s protocol. Protocol detection still on.", proto_name);
     }
 
     return;
-- 
2.47.2