clamav started using the CLAMAV_VERSION macro; rename c-icap clamav module's
internal use of a variable of the same name
This commit is contained in:
parent
7442ce64ad
commit
fad53a949b
@ -0,0 +1,31 @@
|
||||
$OpenBSD: patch-services_virus_scan_clamav_mod_c,v 1.5 2019/11/21 11:58:12 sthen Exp $
|
||||
|
||||
Index: services/virus_scan/clamav_mod.c
|
||||
--- services/virus_scan/clamav_mod.c.orig
|
||||
+++ services/virus_scan/clamav_mod.c
|
||||
@@ -105,7 +105,7 @@ extern ci_off_t CLAMAV_MAXSCANSIZE;
|
||||
extern char *CLAMAV_TMP;
|
||||
|
||||
#define CLAMAV_VERSION_SIZE 64
|
||||
-static char CLAMAV_VERSION[CLAMAV_VERSION_SIZE];
|
||||
+static char _CLAMAV_VERSION[CLAMAV_VERSION_SIZE];
|
||||
#define CLAMAV_SIGNATURE_SIZE SERVICE_ISTAG_SIZE + 1
|
||||
static char CLAMAV_SIGNATURE[CLAMAV_SIGNATURE_SIZE];
|
||||
|
||||
@@ -641,13 +641,13 @@ void clamav_set_versions()
|
||||
CLAMAV_SIGNATURE[CLAMAV_SIGNATURE_SIZE - 1] = '\0';
|
||||
|
||||
/*set the clamav version*/
|
||||
- snprintf(CLAMAV_VERSION, CLAMAV_VERSION_SIZE - 1, "%s/%d", str_version, version);
|
||||
- CLAMAV_VERSION[CLAMAV_VERSION_SIZE - 1] = '\0';
|
||||
+ snprintf(_CLAMAV_VERSION, CLAMAV_VERSION_SIZE - 1, "%s/%d", str_version, version);
|
||||
+ _CLAMAV_VERSION[CLAMAV_VERSION_SIZE - 1] = '\0';
|
||||
}
|
||||
|
||||
const char *clamav_version()
|
||||
{
|
||||
- return CLAMAV_VERSION;
|
||||
+ return _CLAMAV_VERSION;
|
||||
}
|
||||
|
||||
const char *clamav_signature()
|
Loading…
x
Reference in New Issue
Block a user