From: Sreeja Athirkandathil Narayanan (sathirka) <sathirka@cisco.com>
Date: Tue, 17 Oct 2023 20:38:44 +0000 (+0000)
Subject: Pull request #4059: appid: fixing cppcheck issue
X-Git-Tag: 3.1.73.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da82beff3d4d86a0215b13b31d964c0baa571d28;p=thirdparty%2Fsnort3.git

Pull request #4059: appid: fixing cppcheck issue

Merge in SNORT/snort3 from ~SATHIRKA/snort3:fix_cppcheck to master

Squashed commit of the following:

commit 0b0614d79c862b35fca04c6dd70b30069ee316c2
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Tue Oct 17 08:45:52 2023 -0400

    appid: fixing cppcheck issue
---

diff --git a/src/network_inspectors/appid/tp_appid_utils.cc b/src/network_inspectors/appid/tp_appid_utils.cc
index f376fb0e4..1763af704 100644
--- a/src/network_inspectors/appid/tp_appid_utils.cc
+++ b/src/network_inspectors/appid/tp_appid_utils.cc
@@ -577,8 +577,8 @@ bool do_tp_discovery(ThirdPartyAppIdContext& tp_appid_ctxt, AppIdSession& asd, I
             TP_SESSION_FLAG_TUNNELING | TP_SESSION_FLAG_FUTUREFLOW);
     }
 
-    const char *app_name = asd.get_odp_ctxt().get_app_info_mgr().get_app_name(tp_app_id);
-    appid_log(p, TRACE_DEBUG_LEVEL, "3rd party returned %s (%d)\n", app_name ? app_name : "unknown", tp_app_id);
+    const char *tp_app_name = asd.get_odp_ctxt().get_app_info_mgr().get_app_name(tp_app_id);
+    appid_log(p, TRACE_DEBUG_LEVEL, "3rd party returned %s (%d)\n", tp_app_name ? tp_app_name : "unknown", tp_app_id);
 
     process_third_party_results(*p, asd, tp_confidence, tp_proto_list, tp_attribute_data, change_bits);