From b42948593553e98b30aaae3c1ddc7a6bed1825ea Mon Sep 17 00:00:00 2001
From: Andy Ragusa <aragusa@cisco.com>
Date: Thu, 18 Jul 2024 11:15:07 -0700
Subject: [PATCH] Addressed feedback from code review.

---
 libclamav/scanners.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index f22e58be6f..dde7c086c0 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -2472,25 +2472,19 @@ const char * URI_LIST[] = {
 
 static bool is_url(const char *const str)
 {
-
-#define MATCH(str, prefix)                                                                              \
-    do {                                                                                                \
-        if (str && (strlen(str) > strlen(prefix)) && (0 == strncasecmp(str, prefix, strlen(prefix)))) { \
-            bRet = true;                                                                                \
-            goto done;                                                                                  \
-        }                                                                                               \
-    } while (0);
-
     bool bRet = false;
     size_t i;
 
     for (i = 0; i < sizeof(URI_LIST) / sizeof(URI_LIST[0]); i++) {
-        MATCH(str, URI_LIST[i]);
+        if (str && (strlen(str) > strlen(URI_LIST[i])) && (0 == strncasecmp(str, URI_LIST[i], strlen(URI_LIST[i])))) {
+            bRet = true;
+            goto done;
+        }
     }
 done:
     return bRet;
-#undef MATCH
 }
+
 static void save_urls(cli_ctx *ctx, tag_arguments_t *hrefs, form_data_t *form_data)
 {
     int i            = 0;