[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
Tomasz Kojm
tkojm at clamav.net
Sun Apr 4 01:04:55 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit e78b518630ca9fa1f40522136b3cdc5a27321f5e
Author: Tomasz Kojm <tkojm at clamav.net>
Date: Tue Sep 15 22:46:35 2009 +0200
fix some debug format
diff --git a/clamd/thrmgr.c b/clamd/thrmgr.c
index af4a56c..54bedac 100644
--- a/clamd/thrmgr.c
+++ b/clamd/thrmgr.c
@@ -455,7 +455,7 @@ threadpool_t *thrmgr_new(int max_threads, int idle_timeout, int max_queue, void
pthread_attr_getstacksize(&(threadpool->pool_attr), &stacksize);
stacksize = stacksize + 64 * 1024;
if (stacksize < 1048576) stacksize = 1048576; /* at least 1MB please */
- logg("Set stacksize to %u\n", stacksize);
+ logg("Set stacksize to %lu\n", (unsigned long int) stacksize);
pthread_attr_setstacksize(&(threadpool->pool_attr), stacksize);
#endif
threadpool->state = POOL_VALID;
diff --git a/libclamav/autoit.c b/libclamav/autoit.c
index e7009d3..4298648 100644
--- a/libclamav/autoit.c
+++ b/libclamav/autoit.c
@@ -704,7 +704,7 @@ static int ea06(int desc, cli_ctx *ctx, char *tmpd) {
val = (uint64_t)cli_readint32((char *)&UNP.outputbuf[UNP.cur_input+4]);
val <<=32;
val += (uint64_t)cli_readint32((char *)&UNP.outputbuf[UNP.cur_input]);
- snprintf((char *)&buf[UNP.cur_output], 20, "0x%016lx ", val);
+ snprintf((char *)&buf[UNP.cur_output], 20, "0x%016lx ", (unsigned long int) val);
UNP.cur_output += 19;
UNP.cur_input += 8;
break;
diff --git a/libclamav/ishield.c b/libclamav/ishield.c
index 6e2cb67..d51f314 100644
--- a/libclamav/ishield.c
+++ b/libclamav/ishield.c
@@ -225,7 +225,7 @@ int cli_scanishield_msi(int desc, cli_ctx *ctx, off_t off) {
csize = le64_to_host(fb.csize);
if(ctx->engine->maxfilesize && csize > ctx->engine->maxfilesize) {
- cli_dbgmsg("ishield-msi: skipping stream due to size limits (%lu vs %lu)\n", csize, ctx->engine->maxfilesize);
+ cli_dbgmsg("ishield-msi: skipping stream due to size limits (%lu vs %lu)\n", (unsigned long int) csize, (unsigned long int) ctx->engine->maxfilesize);
lseek(desc, csize, SEEK_CUR);
continue;
}
@@ -278,7 +278,7 @@ int cli_scanishield_msi(int desc, cli_ctx *ctx, off_t off) {
break;
}
if(ctx->engine->maxfilesize && z.total_out > ctx->engine->maxfilesize) {
- cli_dbgmsg("ishield-msi: trimming output file due to size limits (%lu vs %lu)\n", z.total_out, ctx->engine->maxfilesize);
+ cli_dbgmsg("ishield-msi: trimming output file due to size limits (%lu vs %lu)\n", z.total_out, (unsigned long int) ctx->engine->maxfilesize);
lseek(desc, csize, SEEK_CUR);
csize = 0;
break;
@@ -371,7 +371,7 @@ int cli_scanishield(int desc, cli_ctx *ctx, off_t off, size_t sz) {
data - buf >= sz - fsize
) break;
- cli_dbgmsg("ishield: @%lx found file %s (%s) - version %s - size %lu\n", coff, fname, path, version, fsize);
+ cli_dbgmsg("ishield: @%lx found file %s (%s) - version %s - size %lu\n", (unsigned long int) coff, fname, path, version, (unsigned long int) fsize);
sz -= (data - buf) + fsize;
coff += (data - buf);
if(!strncasecmp(fname, "data", 4)) {
@@ -636,7 +636,7 @@ static int is_parse_hdr(int desc, cli_ctx *ctx, struct IS_CABSTUFF *c) {
int cabret = CL_CLEAN;
if(ctx->engine->maxfilesize && file_csize > ctx->engine->maxfilesize) {
- cli_dbgmsg("is_parse_hdr: skipping file due to size limits (%lu vs %lu)\n", file_csize, ctx->engine->maxfilesize);
+ cli_dbgmsg("is_parse_hdr: skipping file due to size limits (%lu vs %lu)\n", (unsigned long int) file_csize, (unsigned long int) ctx->engine->maxfilesize);
break;
}
@@ -797,7 +797,7 @@ static int is_extract_cab(int desc, cli_ctx *ctx, uint64_t off, uint64_t size, u
break;
}
if(ctx->engine->maxfilesize && z.total_out > ctx->engine->maxfilesize) {
- cli_dbgmsg("ishield_extract_cab: trimming output file due to size limits (%lu vs %lu)\n", z.total_out, ctx->engine->maxfilesize);
+ cli_dbgmsg("ishield_extract_cab: trimming output file due to size limits (%lu vs %lu)\n", z.total_out, (unsigned long int) ctx->engine->maxfilesize);
success = 1;
outsz = size;
break;
diff --git a/libclamav/others.c b/libclamav/others.c
index b5ae1fa..55663df 100644
--- a/libclamav/others.c
+++ b/libclamav/others.c
@@ -567,7 +567,7 @@ int cli_checklimits(const char *who, cli_ctx *ctx, unsigned long need1, unsigned
/* if the remaining scansize is too small... */
if(ctx->engine->maxscansize-ctx->scansize<needed) {
/* ... we tell the caller to skip this file */
- cli_dbgmsg("%s: scansize exceeded (initial: %lu, remaining: %lu, needed: %lu)\n", who, ctx->engine->maxscansize, ctx->scansize, needed);
+ cli_dbgmsg("%s: scansize exceeded (initial: %lu, remaining: %lu, needed: %lu)\n", who, (unsigned long int) ctx->engine->maxscansize, (unsigned long int) ctx->scansize, needed);
ret = CL_EMAXSIZE;
}
}
@@ -575,7 +575,7 @@ int cli_checklimits(const char *who, cli_ctx *ctx, unsigned long need1, unsigned
/* if we have per-file size limits, and we are overlimit... */
if(needed && ctx->engine->maxfilesize && ctx->engine->maxfilesize<needed) {
/* ... we tell the caller to skip this file */
- cli_dbgmsg("%s: filesize exceeded (allowed: %lu, needed: %lu)\n", who, ctx->engine->maxfilesize, needed);
+ cli_dbgmsg("%s: filesize exceeded (allowed: %lu, needed: %lu)\n", who, (unsigned long int) ctx->engine->maxfilesize, needed);
ret = CL_EMAXSIZE;
}
diff --git a/libclamav/unarj.c b/libclamav/unarj.c
index 1508909..faa3247 100644
--- a/libclamav/unarj.c
+++ b/libclamav/unarj.c
@@ -1061,7 +1061,7 @@ int cli_unarj_extract_file(int fd, const char *dirname, arj_metadata_t *metadata
if (metadata->encrypted) {
cli_dbgmsg("PASSWORDed file (skipping)\n");
offset = lseek(fd, 0, SEEK_CUR) + metadata->comp_size;
- cli_dbgmsg("Target offset: %ld\n", offset);
+ cli_dbgmsg("Target offset: %lu\n", (unsigned long int) offset);
if (lseek(fd, offset, SEEK_SET) != offset) {
return CL_ESEEK;
}
diff --git a/libclamav/unzip.c b/libclamav/unzip.c
index 8dd0bc0..de17bf9 100644
--- a/libclamav/unzip.c
+++ b/libclamav/unzip.c
@@ -106,7 +106,7 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui
}
if(res==1) {
if(ctx->engine->maxfilesize && csize > ctx->engine->maxfilesize) {
- cli_dbgmsg("cli_unzip: trimming output size to maxfilesize (%lu)\n", ctx->engine->maxfilesize);
+ cli_dbgmsg("cli_unzip: trimming output size to maxfilesize (%lu)\n", (long unsigned int) ctx->engine->maxfilesize);
csize = ctx->engine->maxfilesize;
}
if(cli_writen(of, src, csize)!=(int)csize) ret = CL_EWRITE;
@@ -167,7 +167,7 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui
if(*avail_out!=sizeof(obuf)) {
written+=sizeof(obuf)-(*avail_out);
if(ctx->engine->maxfilesize && written > ctx->engine->maxfilesize) {
- cli_dbgmsg("cli_unzip: trimming output size to maxfilesize (%lu)\n", ctx->engine->maxfilesize);
+ cli_dbgmsg("cli_unzip: trimming output size to maxfilesize (%lu)\n", (long unsigned int) ctx->engine->maxfilesize);
res = Z_STREAM_END;
break;
}
@@ -211,7 +211,7 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui
if(strm.avail_out!=sizeof(obuf)) {
written+=sizeof(obuf)-strm.avail_out;
if(ctx->engine->maxfilesize && written > ctx->engine->maxfilesize) {
- cli_dbgmsg("cli_unzip: trimming output size to maxfilesize (%lu)\n", ctx->engine->maxfilesize);
+ cli_dbgmsg("cli_unzip: trimming output size to maxfilesize (%lu)\n", (unsigned long int) ctx->engine->maxfilesize);
res = BZ_STREAM_END;
break;
}
@@ -248,7 +248,7 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui
if(strm.avail_out!=sizeof(obuf)) {
written+=sizeof(obuf)-strm.avail_out;
if(ctx->engine->maxfilesize && written > ctx->engine->maxfilesize) {
- cli_dbgmsg("cli_unzip: trimming output size to maxfilesize (%lu)\n", ctx->engine->maxfilesize);
+ cli_dbgmsg("cli_unzip: trimming output size to maxfilesize (%lu)\n", (unsigned long int) ctx->engine->maxfilesize);
res = 0;
break;
}
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list