[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 5e5aa2f24036c047292a2a174066b7fe939842ef
Author: Török Edvin <edwin at clamav.net>
Date:   Sat Oct 10 09:46:39 2009 +0300

    Fix tests.

diff --git a/unit_tests/check_htmlnorm.c b/unit_tests/check_htmlnorm.c
index 24edd7f..a859c95 100644
--- a/unit_tests/check_htmlnorm.c
+++ b/unit_tests/check_htmlnorm.c
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include "checks.h"
+#include "../libclamav/fmap.h"
 #include "../libclamav/dconf.h"
 #include "../libclamav/htmlnorm.h"
 #include "../libclamav/others.h"
@@ -106,7 +107,7 @@ START_TEST (test_htmlnorm_api)
 {
 	int fd;
 	tag_arguments_t hrefs;
-	struct F_MAP *map;
+	fmap_t *map;
 
 	memset(&hrefs, 0, sizeof(hrefs));
 
diff --git a/unit_tests/check_matchers.c b/unit_tests/check_matchers.c
index f5197f3..7597fcc 100644
--- a/unit_tests/check_matchers.c
+++ b/unit_tests/check_matchers.c
@@ -116,7 +116,7 @@ START_TEST (test_bm_scanbuff) {
     ret = cli_parse_add(root, "Sig3", "babedead", 0, 0, "*", 0, NULL, 0);
     fail_unless(ret == CL_SUCCESS, "cli_parse_add() failed");
 
-    ret = cli_bm_scanbuff("blah\xde\xad\xbe\xef", 12, &virname, NULL, root, 0, -1, NULL);
+    ret = cli_bm_scanbuff("blah\xde\xad\xbe\xef", 12, &virname, NULL, root, 0, NULL, NULL);
     fail_unless(ret == CL_VIRUS, "cli_bm_scanbuff() failed");
     fail_unless(!strncmp(virname, "Sig2", 4), "Incorrect signature matched in cli_bm_scanbuff()\n");
     cli_bm_free(root);

-- 
Debian repository for ClamAV