@@ -1257,7 +1257,7 @@ static int buildcld(const char *tmpdir, const char *dbname, const char *newfile,

 	char cwd[512], info[32], buff[513], *pt;

 	struct dirent *dent;

 	int fd, err = 0;

-	gzFile *gzs = NULL;

+	gzFile gzs = NULL;

     if(!getcwd(cwd, sizeof(cwd))) {

 	logg("!buildcld: Can't get path of current working directory\n");

@@ -93,23 +93,6 @@

 #endif

-/* Max size of any number in bits.  Basically the largest size you will be multiplying

- * should be half [or smaller] of FP_MAX_SIZE-four_digit

- *

- * You can externally define this or it defaults to 4096-bits [allowing multiplications upto 2048x2048 bits ]

- */

-#ifndef FP_MAX_SIZE

-   #define FP_MAX_SIZE           (8192+(8*DIGIT_BIT))

-#endif

-

-/* will this lib work? */

-#if (CHAR_BIT & 7)

-   #error CHAR_BIT must be a multiple of eight.

-#endif

-#if FP_MAX_SIZE % CHAR_BIT

-   #error FP_MAX_SIZE must be a multiple of CHAR_BIT

-#endif

-

 /* autodetect x86-64 and make sure we are using 64-bit digits with x86-64 asm */

 #if defined(__x86_64__)

    #if defined(TFM_X86) || defined(TFM_SSE2) || defined(TFM_ARM) 

@@ -272,6 +255,20 @@

 /* # of digits this is */

 #define DIGIT_BIT  (int)((CHAR_BIT) * sizeof(fp_digit))

+/* Max size of any number in bits.  Basically the largest size you will be multiplying

+ * should be half [or smaller] of FP_MAX_SIZE-four_digit

+ *

+ * You can externally define this or it defaults to 4096-bits [allowing multiplications upto 2048x2048 bits ]

+ */

+#ifndef FP_MAX_SIZE

+   #define FP_MAX_SIZE           (8192+(8*DIGIT_BIT))

+#endif

+

+/* will this lib work? */

+#if (CHAR_BIT & 7)

+   #error CHAR_BIT must be a multiple of eight.

+#endif

+

 #define FP_MASK    (fp_digit)(-1)

 #define FP_SIZE    (FP_MAX_SIZE/DIGIT_BIT)

@@ -54,7 +54,7 @@ static int cli_untgz(int fd, const char *destdir)

 	unsigned int size, pathlen = strlen(destdir) + 100 + 5;

 	FILE *outfile = NULL;

 	struct stat foo;

-	gzFile *infile;

+	gzFile infile;

     cli_dbgmsg("in cli_untgz()\n");

@@ -28,7 +28,7 @@

 #include "sha256.h"

 struct cli_dbio {

-    gzFile *gzs;

+    gzFile gzs;

     FILE *fs;

     unsigned int size, bread;

     char *buf, *bufpt, *readpt;

@@ -484,7 +484,7 @@ static inline void html_tag_contents_append(struct tag_contents *cont, const uns

             if (mbchar && (c < 0x80 || mbchar >= 0x10000)) {

                 if (mbchar == 0xE38082 || mbchar == 0xEFBC8E

                     || mbchar == 0xEFB992 ||

-                    mbchar == 0xA1 && (c == 0x43 || c == 0x44 || c == 0x4F)) {

+                    (mbchar == 0xA1 && (c == 0x43 || c == 0x44 || c == 0x4F))) {

                     cont->contents[i++] = '.';

                     if (mbchar == 0xA1) {

                         --i;

@@ -791,7 +791,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

                                 if (*ptr < 0x80 || mbchar >= 0x10000) {

                                     if (mbchar == 0xE38082 || mbchar == 0xEFBC8E

                                         || mbchar == 0xEFB992 ||

-                                        mbchar == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F)) {

+                                        (mbchar == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F))) {

                                         /* bb #4097 */

                                         html_output_c(file_buff_o2, '.');

                                         html_output_c(file_buff_text, '.');

@@ -1089,7 +1089,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

                                     if (mbchar2 && (*ptr < 0x80 || mbchar2 >= 0x10000)) {

                                         if (mbchar2 == 0xE38082 || mbchar2 == 0xEFBC8E

                                             || mbchar2 == 0xEFB992 ||

-                                            mbchar2 == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F)) {

+                                            (mbchar2 == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F))) {

                                             html_output_c(file_buff_o2, '.');

                                             if (tag_val_length < HTML_STR_LENGTH)

 						tag_val[tag_val_length++] = '.';

@@ -91,15 +91,15 @@ static int iso_scan_file(const iso9660_t *iso, unsigned int block, unsigned int

 static char *iso_string(iso9660_t *iso, const void *src, unsigned int len) {

     if(iso->joliet) {

 	char *utf8;

+        const char *uutf8;

 	if(len > sizeof(iso->buf))

 	    len = sizeof(iso->buf) - 2;

 	memcpy(iso->buf, src, len);

 	iso->buf[len] = '\0';

 	iso->buf[len+1] = '\0';

 	utf8 = cli_utf16_to_utf8(iso->buf, len, UTF16_BE);

-	if(!utf8)

-	    utf8 = "";

-	strncpy(iso->buf, utf8, sizeof(iso->buf));

+        uutf8 = utf8 ? utf8 : "";

+	strncpy(iso->buf, uutf8, sizeof(iso->buf));

 	iso->buf[sizeof(iso->buf)-1] = '\0';

 	free(utf8);

     } else {

@@ -402,7 +402,7 @@ int cli_checkfp(unsigned char *digest, size_t size, cli_ctx *ctx)

 	int have_sha1, have_sha256, do_dsig_check = 1;

     if(cli_hm_scan(digest, size, &virname, ctx->engine->hm_fp, CLI_HASH_MD5) == CL_VIRUS) {

-	cli_dbgmsg("cli_checkfp(md5): Found false positive detection (fp sig: %s), size: %d\n", virname, size);

+	cli_dbgmsg("cli_checkfp(md5): Found false positive detection (fp sig: %s), size: %d\n", virname, (int)size);

 	return CL_CLEAN;

     }

@@ -601,9 +601,9 @@ static void aes_decrypt(const unsigned char *in, off_t *length, unsigned char *q

     unsigned char pad, i;

     int nrounds;

-    cli_dbgmsg("cli_pdf: aes_decrypt: key length: %d, data length: %d\n", key_n, *length);

+    cli_dbgmsg("cli_pdf: aes_decrypt: key length: %d, data length: %d\n", key_n, (int)*length);

     if (key_n > 32) {

-	cli_dbgmsg("cli_pdf: aes_decrypt: key length is %s!\n", key_n*8);

+	cli_dbgmsg("cli_pdf: aes_decrypt: key length is %d!\n", key_n*8);

 	return;

     }

     if (len < 32) {

@@ -650,7 +650,7 @@ static void aes_decrypt(const unsigned char *in, off_t *length, unsigned char *q

 	len += pad;

     }

     *length -= len;

-    cli_dbgmsg("cli_pdf: aes_decrypt: length is %d\n", *length);

+    cli_dbgmsg("cli_pdf: aes_decrypt: length is %d\n", (int)*length);

 }

@@ -1046,7 +1046,7 @@ static int pdf_extract_obj(struct pdf_struct *pdf, struct pdf_obj *obj)

 		break;

 	    }

             free(js);

-	    cli_dbgmsg("bytesleft: %d\n", bytesleft);

+	    cli_dbgmsg("bytesleft: %d\n", (int)bytesleft);

             q2 = pdf_nextobject(q, bytesleft);

             if (!q2) q2 = q + bytesleft - 1;

@@ -1666,7 +1666,7 @@ static void check_user_password(struct pdf_struct *pdf, int R, const char *O,

 	    sha256_final(&sha256, result2);

 	    n = UE ? strlen(UE) : 0;

 	    if (n != 32) {

-		cli_dbgmsg("cli_pdf: UE length is not 32: %d\n", n);

+		cli_dbgmsg("cli_pdf: UE length is not 32: %d\n", (int)n);

 		noisy_warnmsg("cli_pdf: UE length is not 32: %d\n", n);

 	    } else {

 		pdf->keylen = 32;

@@ -18,8 +18,8 @@ const char *fp_ident(void)

 "TomsFastMath (%s)\n"

 "\n"

 "Sizeofs\n"

-"\tfp_digit = %u\n"

-"\tfp_word  = %u\n"

+"\tfp_digit = %lu\n"

+"\tfp_word  = %lu\n"

 "\n"

 "FP_MAX_SIZE = %u\n"

 "\n"

@@ -137,7 +137,7 @@ cli_untar(const char *dir, unsigned int posix, cli_ctx *ctx)

 		size_t nread;

 		block = fmap_need_off_once_len(*ctx->fmap, pos, BLOCKSIZE, &nread); 

-		cli_dbgmsg("cli_untar: pos = %d\n", pos);

+		cli_dbgmsg("cli_untar: pos = %d\n", (int)pos);

 		if(!in_block && !nread)

 			break;

@@ -757,7 +757,7 @@ int cdiff_apply(int fd, unsigned short mode)

 {

 	struct cdiff_ctx ctx;

 	FILE *fh;

-	gzFile *gzh;

+	gzFile gzh;

 	char *line, *lbuf, buff[FILEBUFF], *dsig = NULL;

 	unsigned int lines = 0, cmds = 0;

 	unsigned int difflen, diffremain, line_size = CDIFF_LINE_SIZE;

@@ -47,7 +47,7 @@ struct tar_header {

 };

 #define TARBLK 512

-int tar_addfile(int fd, gzFile *gzs, const char *file)

+int tar_addfile(int fd, gzFile gzs, const char *file)

 {

 	int s, bytes;

 	struct tar_header hdr;

@@ -23,6 +23,6 @@

 #include <zlib.h>

-int tar_addfile(int fd, gzFile *gzs, const char *file);

+int tar_addfile(int fd, gzFile gzs, const char *file);

 #endif

@@ -504,7 +504,7 @@ static int script2cdiff(const char *script, const char *builder, const struct op

 	SHA256_CTX ctx;

 	struct stat sb;

 	FILE *scripth, *cdiffh;

-	gzFile *gzh;

+	gzFile gzh;

 	unsigned int ver, osize;

 	int bytes;

@@ -633,7 +633,7 @@ static int build(const struct optstruct *opts)

 	const char *newcvd, *localdbdir = NULL;

         struct cl_engine *engine;

 	FILE *cvd, *fh;

-	gzFile *tar;

+	gzFile tar;

 	time_t timet;

 	struct tm *brokent;

 	struct cl_cvd *oldcvd;