[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 9aa1d72591c97f6185baefbf8b01d9748614e437
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Mar 22 13:00:23 2010 +0200

    Fix distcheck errors.

diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c
index dedf828..0b33895 100644
--- a/libclamav/bytecode.c
+++ b/libclamav/bytecode.c
@@ -33,6 +33,7 @@
 #include "bytecode_priv.h"
 #include "readdb.h"
 #include "scanners.h"
+#include "bytecode_api_impl.h"
 #include <string.h>
 
 /* TODO: we should make sure lsigcnt is never NULL, and has at least as many
diff --git a/libclamav/bytecode_api.c b/libclamav/bytecode_api.c
index bd8e4b1..5464377 100644
--- a/libclamav/bytecode_api.c
+++ b/libclamav/bytecode_api.c
@@ -41,6 +41,7 @@
 #include "others.h"
 #include "pe.h"
 #include "disasm.h"
+#include "scanners.h"
 
 uint32_t cli_bcapi_test1(struct cli_bc_ctx *ctx, uint32_t a, uint32_t b)
 {
@@ -432,7 +433,7 @@ int32_t cli_bcapi_read_number(struct cli_bc_ctx *ctx, uint32_t radix)
     char *p;
     int32_t result;
 
-    if (radix != 10 && radix != 16 || !ctx->fmap)
+    if ((radix != 10 && radix != 16) || !ctx->fmap)
 	return -1;
     while ((p = fmap_need_off_once(ctx->fmap, ctx->off, BUF))) {
 	for (i=0;i<BUF;i++) {
@@ -485,6 +486,7 @@ int32_t cli_bcapi_hashset_remove(struct cli_bc_ctx *ctx , int32_t id, uint32_t k
     if (!s)
 	return -1;
 //    return cli_hashset_removekey(s, key);
+    return -1;
 }
 
 int32_t cli_bcapi_hashset_contains(struct cli_bc_ctx *ctx , int32_t id, uint32_t key)
@@ -504,6 +506,7 @@ int32_t cli_bcapi_hashset_empty(struct cli_bc_ctx *ctx, int32_t id)
 int32_t cli_bcapi_hashset_done(struct cli_bc_ctx *ctx , int32_t id)
 {
     /* TODO */
+    return -1;
 }
 
 int32_t cli_bcapi_buffer_pipe_new(struct cli_bc_ctx *ctx, uint32_t size)
@@ -648,6 +651,7 @@ int32_t cli_bcapi_buffer_pipe_write_stopped(struct cli_bc_ctx *ctx , int32_t id,
 int32_t cli_bcapi_buffer_pipe_done(struct cli_bc_ctx *ctx , int32_t id)
 {
     /* TODO */
+    return -1;
 }
 
 int32_t cli_bcapi_inflate_init(struct cli_bc_ctx *ctx, int32_t from, int32_t to, int32_t windowBits)
@@ -729,7 +733,7 @@ int32_t cli_bcapi_inflate_process(struct cli_bc_ctx *ctx , int32_t id)
 	if (!b->needSync) {
 	    ret = inflate(&b->stream, Z_NO_FLUSH);
 	    if (ret == Z_DATA_ERROR) {
-		cli_dbgmsg("bytecode api: inflate at %u: %s, trying to recover\n", b->stream.total_in,
+		cli_dbgmsg("bytecode api: inflate at %lu: %s, trying to recover\n", b->stream.total_in,
 			   b->stream.msg);
 		b->needSync = 1;
 	    }
diff --git a/libclamav/bytecode_vm.c b/libclamav/bytecode_vm.c
index 0ba8131..8da03f5 100644
--- a/libclamav/bytecode_vm.c
+++ b/libclamav/bytecode_vm.c
@@ -53,7 +53,7 @@ static int never_inline bcfail(const char *msg, long a, long b,
 #define CHECK_GT(a, b) do {if ((a) <= (b)) return \
     bcfail("Condition failed "#a" > "#b,(a),(b), __FILE__, __LINE__); } while(0)
 #define TRACE_R(x) cli_dbgmsg("bytecode trace: %u, read %llx\n", pc, (long long)x);
-#define TRACE_W(x, w, p) cli_dbgmsg("bytecode trace: %u, write%d @%u %llx\n", pc, p, w, (long long)x);
+#define TRACE_W(x, w, p) cli_dbgmsg("bytecode trace: %u, write%d @%u %llx\n", pc, p, w, (long long)(x));
 #define TRACE_EXEC(id, dest, ty, stack) cli_dbgmsg("bytecode trace: executing %d, -> %u (%u); %u\n", id, dest, ty, stack)
 #else
 static inline int bcfail(const char *msg, long a, long b,

-- 
Debian repository for ClamAV