@@ -1,3 +1,8 @@

+Fri Mar 19 16:00:51 CET 2004 (tk)

+---------------------------------

+  * libclamav: small cosmetic fixes in format strings, also added some

+	       statics (thanks to Dirk Mueller <dmuell*gmx.net>)

+

 Fri Mar 19 08:18:24 GMT 2004 (njh)

 ----------------------------------

   * libclamav/mbox.c:	If an RFC822 message is found as part of a multipart

@@ -32,13 +32,14 @@

 #include "clamav.h"

 #include "others.h"

+#include "dsig.h"

-const char *cli_nstr = "118640995551645342603070001658453189751527774412027743746599405743243142607464144767361060640655844749760788890022283424922762488917565551002467771109669598189410434699034532232228621591089508178591428456220796841621637175567590476666928698770143328137383952820383197532047771780196576957695822641224262693037"; /* 1024 bits */

+static const char *cli_nstr = "118640995551645342603070001658453189751527774412027743746599405743243142607464144767361060640655844749760788890022283424922762488917565551002467771109669598189410434699034532232228621591089508178591428456220796841621637175567590476666928698770143328137383952820383197532047771780196576957695822641224262693037"; /* 1024 bits */

-const char *cli_estr = "100001027";

+static const char *cli_estr = "100001027";

-char cli_ndecode(char value)

+static char cli_ndecode(char value)

 {

 	int i;

 	char ncodec[] = {

@@ -61,7 +62,7 @@ char cli_ndecode(char value)

     return -1;

 }

-char *cli_decodesig(const char *sig, int plainlen, mpz_t e, mpz_t n)

+static char *cli_decodesig(const char *sig, int plainlen, mpz_t e, mpz_t n)

 {

 	int i, siglen = strlen(sig), dec;

 	char *decoded;

@@ -209,8 +209,8 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const

 	}

 	if(limits) {

-	    if(limits->maxfilesize && (rarlist->item.UnpSize > limits->maxfilesize)) {

-		cli_dbgmsg("RAR->%s: Size exceeded (%d, max: %d)\n", rarlist->item.Name, rarlist->item.UnpSize, limits->maxfilesize);

+	    if(limits->maxfilesize && (rarlist->item.UnpSize > (unsigned int) limits->maxfilesize)) {

+		cli_dbgmsg("RAR->%s: Size exceeded (%u, max: %lu)\n", rarlist->item.Name, (unsigned int) rarlist->item.UnpSize, limits->maxfilesize);

 		rarlist = rarlist->next;

 		files++;

 		/* ret = CL_EMAXSIZE; */

@@ -241,7 +241,7 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const

 	fd = fileno(tmp);

 	if( urarlib_get(&rar_data_ptr, &rar_data_size, rarlist->item.Name, desc, "clam")) {

-	    cli_dbgmsg("RAR -> Extracted: %s, size: %d\n", rarlist->item.Name, rar_data_size);

+	    cli_dbgmsg("RAR -> Extracted: %s, size: %lu\n", rarlist->item.Name, rar_data_size);

 	    if(fwrite(rar_data_ptr, 1, rar_data_size, tmp) != rar_data_size) {

 		cli_dbgmsg("RAR -> Can't write() file.\n");

 		fclose(tmp);

@@ -380,7 +380,7 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	if(limits) {

 	    if(limits->maxfilesize && (zdirent.st_size > limits->maxfilesize)) {

-		cli_dbgmsg("Zip -> %s: Size exceeded (%d, max: %d)\n", zdirent.d_name, zdirent.st_size, limits->maxfilesize);

+		cli_dbgmsg("Zip -> %s: Size exceeded (%d, max: %ld)\n", zdirent.d_name, zdirent.st_size, limits->maxfilesize);

 		files++;

 		/* ret = CL_EMAXSIZE; */

 		continue; /* this is not a bug */