[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 8ed98a5f5acbb2e2c21a2ee4ad0667f0fa25afe2
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Aug 17 13:04:28 2009 +0300

    Fix make distcheck failure.

diff --git a/libclamav/7z.c b/libclamav/7z.c
index f0de145..5d3c75d 100644
--- a/libclamav/7z.c
+++ b/libclamav/7z.c
@@ -81,7 +81,7 @@ int cli_7unz (int fd, cli_ctx *ctx) {
 
 	if(f->IsDir || !f->Size) continue;
 	if(ctx->engine->maxfilesize && f->Size > ctx->engine->maxfilesize) {
-	    cli_dbgmsg("cli_7unz: skipping stream due to size limits (%lu vs %lu)\n", f->Size, ctx->engine->maxfilesize);
+	    cli_dbgmsg("cli_7unz: skipping stream due to size limits (%llu vs %llu)\n", (long long)f->Size, (long long)ctx->engine->maxfilesize);
 	    continue;
 	}
 	if (ctx->engine->maxfiles && fu>=ctx->engine->maxfiles) {
diff --git a/libclamav/7z/Bra.c b/libclamav/7z/Bra.c
index 3b75f0c..265c7e7 100644
--- a/libclamav/7z/Bra.c
+++ b/libclamav/7z/Bra.c
@@ -104,8 +104,8 @@ SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
   size -= 4;
   for (i = 0; i <= size; i += 4)
   {
-    if (data[i] == 0x40 && (data[i + 1] & 0xC0) == 0x00 ||
-        data[i] == 0x7F && (data[i + 1] & 0xC0) == 0xC0)
+    if ((data[i] == 0x40 && (data[i + 1] & 0xC0) == 0x00) ||
+        (data[i] == 0x7F && (data[i + 1] & 0xC0) == 0xC0))
     {
       UInt32 src =
         ((UInt32)data[i + 0] << 24) |

-- 
Debian repository for ClamAV