From f9b0b1a3304c266dcf80217caf812c92fba09da9 Mon Sep 17 00:00:00 2001
From: Andy Ragusa <aragusa@cisco.com>
Date: Thu, 18 Jul 2024 10:58:39 -0700
Subject: [PATCH] Addressing feedback from code review

---
 clamscan/manager.c | 2 +-
 libclamav/clamav.h | 2 +-
 libclamav/others.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clamscan/manager.c b/clamscan/manager.c
index be514a9c66..abdd558632 100644
--- a/clamscan/manager.c
+++ b/clamscan/manager.c
@@ -1558,7 +1558,7 @@ int scanmanager(const struct optstruct *opts)
     }
 
     if (optget(opts, "json-store-html-urls")->enabled) {
-        options.general |= CL_SCAN_STORE_HTML_URLS;
+        options.general |= CL_SCAN_GENERAL_STORE_HTML_URLS;
     }
 
     /* TODO: Remove deprecated option in a future feature release */
diff --git a/libclamav/clamav.h b/libclamav/clamav.h
index a8f84055b4..53eab7c9ba 100644
--- a/libclamav/clamav.h
+++ b/libclamav/clamav.h
@@ -168,6 +168,7 @@ struct cl_scan_options {
 #define CL_SCAN_GENERAL_HEURISTICS                  0x4  /* option to enable heuristic alerts */
 #define CL_SCAN_GENERAL_HEURISTIC_PRECEDENCE        0x8  /* allow heuristic match to take precedence. */
 #define CL_SCAN_GENERAL_UNPRIVILEGED                0x10 /* scanner will not have read access to files. */
+#define CL_SCAN_GENERAL_STORE_HTML_URLS             0x4000 /* Store urls found in html <a and <form tags*/
 
 /* parsing capabilities options */
 #define CL_SCAN_PARSE_ARCHIVE                       0x1
@@ -198,7 +199,6 @@ struct cl_scan_options {
 #define CL_SCAN_HEURISTIC_STRUCTURED_SSN_STRIPPED   0x800  /* alert when detecting stripped social security numbers */
 #define CL_SCAN_HEURISTIC_STRUCTURED_CC             0x1000 /* alert when detecting credit card numbers */
 #define CL_SCAN_HEURISTIC_BROKEN_MEDIA              0x2000 /* alert if a file does not match the identified file format, works with JPEG, TIFF, GIF, PNG */
-#define CL_SCAN_STORE_HTML_URLS                     0x4000 /* Store urls found in html <a and <form tags*/
 
 /* mail scanning options */
 #define CL_SCAN_MAIL_PARTIAL_MESSAGE                0x1
diff --git a/libclamav/others.h b/libclamav/others.h
index fdff4283ca..b3d20859a6 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -552,7 +552,7 @@ extern LIBCLAMAV_EXPORT int have_rar;
 #define SCAN_HEURISTICS (ctx->options->general & CL_SCAN_GENERAL_HEURISTICS)
 #define SCAN_HEURISTIC_PRECEDENCE (ctx->options->general & CL_SCAN_GENERAL_HEURISTIC_PRECEDENCE)
 #define SCAN_UNPRIVILEGED (ctx->options->general & CL_SCAN_GENERAL_UNPRIVILEGED)
-#define STORE_HTML_URLS (ctx->options->general & CL_SCAN_STORE_HTML_URLS)
+#define STORE_HTML_URLS (ctx->options->general & CL_SCAN_GENERAL_STORE_HTML_URLS)
 
 #define SCAN_PARSE_ARCHIVE (ctx->options->parse & CL_SCAN_PARSE_ARCHIVE)
 #define SCAN_PARSE_ELF (ctx->options->parse & CL_SCAN_PARSE_ELF)