[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 2cad7c395d4d0439851ab4c03fe4554b2dedaeaa
Author: Török Edvin <edwin at clamav.net>
Date:   Tue Jul 7 18:56:21 2009 +0300

    Fix compiler warnings

diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c
index e3aeeb5..a3d0f61 100644
--- a/libclamav/bytecode.c
+++ b/libclamav/bytecode.c
@@ -174,7 +174,7 @@ static inline operand_t readOperand(struct cli_bc_func *func, unsigned char *p,
     if (!*ok)
 	return MAX_OP;
     if (v >= numValues) {
-	cli_errmsg("Operand index exceeds bounds: %u >= %u!\n", v, numValues);
+	cli_errmsg("Operand index exceeds bounds: %u >= %u!\n", (unsigned)v, (unsigned)numValues);
 	*ok = 0;
 	return MAX_OP;
     }
@@ -507,7 +507,7 @@ static int parseBB(struct cli_bc *bc, unsigned func, unsigned bb, unsigned char
 	}
 	BB->insts[BB->numInsts++] = inst;
     }
-    if (bb == bc->funcs[func].numBB-1) {
+    if (bb+1 == bc->funcs[func].numBB) {
 	if (buffer[offset] != 'E') {
 	    cli_errmsg("Missing basicblock terminator, got: %c\n", buffer[offset]);
 	    return CL_EMALFDB;
@@ -598,9 +598,9 @@ void cli_bytecode_destroy(struct cli_bc *bc)
 	for (j=0;j<f->numBB;j++) {
 	    struct cli_bc_bb *BB = &f->BB[j];
 	    for(k=0;k<BB->numInsts;k++) {
-		struct cli_bc_inst *i = &BB->insts[k];
-		if (operand_counts[i->opcode] > 3)
-		    free(i->u.ops.ops);
+		struct cli_bc_inst *ii = &BB->insts[k];
+		if (operand_counts[ii->opcode] > 3)
+		    free(ii->u.ops.ops);
 	    }
 	}
 	free(f->BB);

-- 
Debian repository for ClamAV