[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 2125a9c9fa430b0a8b46afce9754664778498fd7
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Feb 10 10:22:07 2010 +0200

    Fix win32 build (bb #1824).

diff --git a/libclamav/filtering.c b/libclamav/filtering.c
index 813c652..e6f4437 100644
--- a/libclamav/filtering.c
+++ b/libclamav/filtering.c
@@ -292,7 +292,7 @@ enum badness {
 	avoid_anywhere, /* includes avoid_first! */
 	/* not that bad, but still not best */
 	dontlike,
-	accept,
+	acceptable,
 	like
 };
 static inline void get_score(enum badness badness, unsigned i, const struct filter *m, const struct char_spec *spec0, const struct char_spec *spec1, int32_t *score, int32_t *score_end)
@@ -320,7 +320,7 @@ static inline void get_score(enum badness badness, unsigned i, const struct filt
 		case dontlike:
 			base = 0;
 			break;
-		case accept:
+		case acceptable:
 			base = 0x200;
 			break;
 		case like:
@@ -496,7 +496,7 @@ int  filter_add_acpatt(struct filter *m, const struct cli_ac_patt *pat)
 				char_badness[i] = avoid_anywhere;
 		} else {
 			int8_t binary = 0;
-			enum badness scor = accept;
+			enum badness scor = acceptable;
 			for(k0=spec0->start;k0 <= spec0->end;k0 += spec0->step) {
 				for(k1=spec1->start;k1 <= spec1->end;k1 += spec1->step) {
 					unsigned char c0 = spec_ith_char(spec0, k0);
@@ -513,7 +513,7 @@ int  filter_add_acpatt(struct filter *m, const struct cli_ac_patt *pat)
 						binary = 1;
 				}
 			}
-			if (scor == accept && binary) {
+			if (scor == acceptable && binary) {
 				/* slightly favor binary */
 				scor = like;
 			}
@@ -543,7 +543,7 @@ int  filter_add_acpatt(struct filter *m, const struct cli_ac_patt *pat)
 		while ((kend > i+3) && char_badness[kend-1] == reject) kend--;
 		for (k=i;k<kend;k++) {
 			enum badness badness = char_badness[k];
-			if (badness < accept) {
+			if (badness < acceptable) {
 				if (badness == reject) {
 					/* this is a never pick */
 					kend = k;
diff --git a/win32/clamav-config.h b/win32/clamav-config.h
index cb93294..a55a916 100644
--- a/win32/clamav-config.h
+++ b/win32/clamav-config.h
@@ -493,7 +493,7 @@
 /* #undef USE_SYSLOG */
 
 /* Version number of package */
-#define VERSION "devel-r5076-723-ge4bf8f9"
+#define VERSION "devel-r5076-766-g7af2e27"
 
 /* Version suffix for package */
 #define VERSION_SUFFIX ""
diff --git a/win32/libclamav.vcproj b/win32/libclamav.vcproj
index 1183c9b..e844269 100644
--- a/win32/libclamav.vcproj
+++ b/win32/libclamav.vcproj
@@ -185,6 +185,14 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\libclamav\filtering.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libclamav\perflogging.c"
+				>
+			</File>
+			<File
 				RelativePath="..\libclamav\7z.c"
 				>
 			</File>

-- 
Debian repository for ClamAV