@@ -1,3 +1,7 @@

+Mon Feb  4 18:24:14 CET 2008 (tk)

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

+  * libclamav: fix some compiler warnings

+

 Mon Feb  4 18:14:58 CET 2008 (acab)

   * libclamunrar: Use static CRC table - bb#64

@@ -171,12 +171,12 @@ static void itsf_print_header(chm_itsf_header_t *itsf_hdr)

 	cli_dbgmsg("Version:\t%d\n", itsf_hdr->version);

 	cli_dbgmsg("Header len:\t%d\n", itsf_hdr->header_len);

 	cli_dbgmsg("Lang ID:\t%d\n", itsf_hdr->lang_id);

-	cli_dbgmsg("Sec0 offset:\t%llu\n", itsf_hdr->sec0_offset);

-	cli_dbgmsg("Sec0 len:\t%llu\n", itsf_hdr->sec0_len);

-	cli_dbgmsg("Dir offset:\t%llu\n", itsf_hdr->dir_offset);

-	cli_dbgmsg("Dir len:\t%llu\n", itsf_hdr->dir_len);

+	cli_dbgmsg("Sec0 offset:\t%lu\n", (unsigned long int) itsf_hdr->sec0_offset);

+	cli_dbgmsg("Sec0 len:\t%lu\n", (unsigned long int) itsf_hdr->sec0_len);

+	cli_dbgmsg("Dir offset:\t%lu\n", (unsigned long int) itsf_hdr->dir_offset);

+	cli_dbgmsg("Dir len:\t%lu\n", (unsigned long int) itsf_hdr->dir_len);

 	if (itsf_hdr->version > 2) {

-		cli_dbgmsg("Data offset:\t%llu\n\n", itsf_hdr->data_offset);

+		cli_dbgmsg("Data offset:\t%lu\n\n", (unsigned long int) itsf_hdr->data_offset);

 	}

 }

@@ -470,7 +470,7 @@ static int read_chunk(chm_metadata_t *metadata, int fd)

         	if (lseek(fd, metadata->chunk_offset, SEEK_SET) != metadata->chunk_offset) {

                 	goto abort;

         	}

-        	if (cli_readn(fd, metadata->chunk_data, metadata->itsp_hdr.block_len) != metadata->itsp_hdr.block_len) {

+        	if ((uint32_t) cli_readn(fd, metadata->chunk_data, metadata->itsp_hdr.block_len) != metadata->itsp_hdr.block_len) {

                		goto abort;

         	}

 	}

@@ -585,8 +585,8 @@ static void print_sys_content(lzx_content_t *lzx_content)

 	}

 	cli_dbgmsg("---- Content ----\n");

-	cli_dbgmsg("Offset:\t%llu\n", lzx_content->offset);

-	cli_dbgmsg("Length:\t%llu\n\n", lzx_content->length);

+	cli_dbgmsg("Offset:\t%lu\n", (unsigned long int) lzx_content->offset);

+	cli_dbgmsg("Length:\t%lu\n\n", (unsigned long int) lzx_content->length);

 }

 static int read_sys_content(int fd, chm_metadata_t *metadata, lzx_content_t *lzx_content)

@@ -608,9 +608,9 @@ static void print_sys_reset_table(lzx_reset_table_t *lzx_reset_table)

 	cli_dbgmsg("Num Entries:\t%u\n", lzx_reset_table->num_entries);

 	cli_dbgmsg("Entry Size:\t%u\n", lzx_reset_table->entry_size);

 	cli_dbgmsg("Table Offset:\t%u\n", lzx_reset_table->table_offset);

-	cli_dbgmsg("Uncom Len:\t%llu\n", lzx_reset_table->uncom_len);

-	cli_dbgmsg("Com Len:\t%llu\n", lzx_reset_table->com_len);

-	cli_dbgmsg("Frame Len:\t%llu\n\n", lzx_reset_table->frame_len);

+	cli_dbgmsg("Uncom Len:\t%lu\n", (unsigned long int) lzx_reset_table->uncom_len);

+	cli_dbgmsg("Com Len:\t%lu\n", (unsigned long int) lzx_reset_table->com_len);

+	cli_dbgmsg("Frame Len:\t%lu\n\n", (unsigned long int) lzx_reset_table->frame_len);

 }

 static int read_sys_reset_table(int fd, chm_metadata_t *metadata, lzx_reset_table_t *lzx_reset_table)

@@ -748,8 +748,8 @@ static int chm_decompress_stream(int fd, chm_metadata_t *metadata, const char *d

 	length += lzx_control.reset_interval;

 	length &= -lzx_control.reset_interval;

-	cli_dbgmsg("Compressed offset: %llu\n", lzx_content.offset);

-	if (lseek(fd, lzx_content.offset, SEEK_SET) != lzx_content.offset) {

+	cli_dbgmsg("Compressed offset: %lu\n", (unsigned long int) lzx_content.offset);

+	if ((uint64_t) lseek(fd, lzx_content.offset, SEEK_SET) != lzx_content.offset) {

 		goto abort;

 	}

@@ -816,7 +816,7 @@ int cli_chm_extract_file(int fd, char *dirname, chm_metadata_t *metadata)

 		cli_dbgmsg("seek in uncompressed stream failed\n");

 		return CL_EFORMAT;

 	}

-	snprintf(filename, 1024, "%s/%llu.chm", dirname, metadata->file_offset);

+	snprintf(filename, 1024, "%s/%lu.chm", dirname, (unsigned long int) metadata->file_offset);

 	metadata->ofd = open(filename, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU);

 	if (metadata->ofd < 0) {

 		return CL_EIO;

@@ -112,6 +112,9 @@ typedef struct chm_metadata_tag {

 	uint16_t chunk_entries;

 } chm_metadata_t;

-int chm_unpack(int fd, const char *dirname);

+int cli_chm_open(int fd, const char *dirname, chm_metadata_t *metadata);

+int cli_chm_prepare_file(int fd, char *dirname, chm_metadata_t *metadata);

+int cli_chm_extract_file(int fd, char *dirname, chm_metadata_t *metadata);

+void cli_chm_close(chm_metadata_t *metadata);

 #endif

@@ -311,4 +311,4 @@ int explode(struct xplstate *X) {

   return EXPLODE_EBUFF;

 }

-void explode_shutdown() {}

+void explode_shutdown(void) {}

@@ -68,6 +68,6 @@ struct xplstate {

 int explode_init(struct xplstate *, uint16_t);

 int explode(struct xplstate *);

-void explode_shutdown();

+void explode_shutdown(void);

 #endif /* __EXPLODE_H */

@@ -100,7 +100,7 @@ static	char	const	rcsid[] = "$Id: mbox.c,v 1.381 2007/02/15 12:26:44 njh Exp $";

 static	void	sigsegv(int sig);

 static	void	print_trace(int use_syslog);

-/*#define	SAVE_TMP	/* Save the file being worked on in tmp */

+/*#define	SAVE_TMP */	/* Save the file being worked on in tmp */

 #endif

 #if	defined(NO_STRTOK_R) || !defined(CL_THREAD_SAFE)

@@ -1414,6 +1414,9 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 		if((retcode == CL_SUCCESS) && messageGetBody(body)) {

 			messageSetCTX(body, ctx);

 			switch(parseEmailBody(body, NULL, &mctx, 0)) {

+				case OK:

+				case OK_ATTACHMENTS_NOT_SAVED:

+					break;

 				case FAIL:

 					/*

 					 * beware: cli_magic_scandesc(),

@@ -3044,7 +3047,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 			}

 		}

 	} /*else

-		rc = OK_ATTACHMENTS_NOT_SAVED;	/* nothing saved */

+		rc = OK_ATTACHMENTS_NOT_SAVED; */	/* nothing saved */

 	if(mainMessage && (mainMessage != messageIn))

 		messageDestroy(mainMessage);

@@ -49,7 +49,7 @@

  */

 #if defined(__i386__) || defined(__x86_64__) || defined(__vax__)

 #define SET(n) \

-	(*(MD5_u32plus *)&ptr[(n) * 4])

+	(*(const MD5_u32plus *)&ptr[(n) * 4])

 #define GET(n) \

 	SET(n)

 #else

@@ -67,9 +67,9 @@

  * This processes one or more 64-byte data blocks, but does NOT update

  * the bit counters.  There are no alignment requirements.

  */

-static void *body(cli_md5_ctx *ctx, void *data, unsigned long size)

+static const void *body(cli_md5_ctx *ctx, const void *data, unsigned long size)

 {

-	unsigned char *ptr;

+	const unsigned char *ptr;

 	MD5_u32plus a, b, c, d;

 	MD5_u32plus saved_a, saved_b, saved_c, saved_d;

@@ -185,7 +185,7 @@ void cli_md5_init(cli_md5_ctx *ctx)

 	ctx->hi = 0;

 }

-void cli_md5_update(cli_md5_ctx *ctx, void *data, unsigned long size)

+void cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size)

 {

 	MD5_u32plus saved_lo;

 	unsigned long used, free;

@@ -206,7 +206,7 @@ void cli_md5_update(cli_md5_ctx *ctx, void *data, unsigned long size)

 		}

 		memcpy(&ctx->buffer[used], data, free);

-		data = (unsigned char *)data + free;

+		data = (const unsigned char *)data + free;

 		size -= free;

 		body(ctx, ctx->buffer, 64);

 	}

@@ -22,7 +22,7 @@ typedef struct {

 } cli_md5_ctx;

 extern void cli_md5_init(cli_md5_ctx *ctx);

-extern void cli_md5_update(cli_md5_ctx *ctx, void *data, unsigned long size);

+extern void cli_md5_update(cli_md5_ctx *ctx, const void *data, unsigned long size);

 extern void cli_md5_final(unsigned char *result, cli_md5_ctx *ctx);

 #endif

@@ -467,12 +467,12 @@ static void ole2_walk_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 				unsigned int rec_level, unsigned int *file_count, const struct cl_limits *limits)

 {

 	property_t prop_block[4];

-	int32_t index, current_block, i;

+	int32_t idx, current_block, i;

 	char *dirname;

 	current_block = hdr->prop_start;

-	if ((prop_index < 0) || (prop_index > hdr->max_block_no) || (rec_level > 100) || (*file_count > 100000)) {

+	if ((prop_index < 0) || (prop_index > (int32_t) hdr->max_block_no) || (rec_level > 100) || (*file_count > 100000)) {

 		return;

 	}

@@ -486,34 +486,34 @@ static void ole2_walk_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 		return;

 	}

-	index = prop_index / 4;

-	for (i=0 ; i < index ; i++) {

+	idx = prop_index / 4;

+	for (i=0 ; i < idx ; i++) {

 		current_block = ole2_get_next_block_number(fd, hdr, current_block);

 		if (current_block < 0) {

 			return;

 		}

 	}

-	index = prop_index % 4;

+	idx = prop_index % 4;

 	if (!ole2_read_block(fd, hdr, prop_block,

 			current_block)) {

 		return;

 	}	

-	if (prop_block[index].type <= 0) {

+	if (prop_block[idx].type <= 0) {

 		return;

 	}

-	prop_block[index].name_size = ole2_endian_convert_16(prop_block[index].name_size);

-	prop_block[index].prev = ole2_endian_convert_32(prop_block[index].prev);

-	prop_block[index].next = ole2_endian_convert_32(prop_block[index].next);

-	prop_block[index].child = ole2_endian_convert_32(prop_block[index].child);

-	prop_block[index].user_flags = ole2_endian_convert_32(prop_block[index].user_flags);

-	prop_block[index].create_lowdate = ole2_endian_convert_32(prop_block[index].create_lowdate);

-	prop_block[index].create_highdate = ole2_endian_convert_32(prop_block[index].create_highdate);

-	prop_block[index].mod_lowdate = ole2_endian_convert_32(prop_block[index].mod_lowdate);

-	prop_block[index].mod_highdate = ole2_endian_convert_32(prop_block[index].mod_highdate);

-	prop_block[index].start_block = ole2_endian_convert_32(prop_block[index].start_block);

-	prop_block[index].size = ole2_endian_convert_32(prop_block[index].size);

+	prop_block[idx].name_size = ole2_endian_convert_16(prop_block[idx].name_size);

+	prop_block[idx].prev = ole2_endian_convert_32(prop_block[idx].prev);

+	prop_block[idx].next = ole2_endian_convert_32(prop_block[idx].next);

+	prop_block[idx].child = ole2_endian_convert_32(prop_block[idx].child);

+	prop_block[idx].user_flags = ole2_endian_convert_32(prop_block[idx].user_flags);

+	prop_block[idx].create_lowdate = ole2_endian_convert_32(prop_block[idx].create_lowdate);

+	prop_block[idx].create_highdate = ole2_endian_convert_32(prop_block[idx].create_highdate);

+	prop_block[idx].mod_lowdate = ole2_endian_convert_32(prop_block[idx].mod_lowdate);

+	prop_block[idx].mod_highdate = ole2_endian_convert_32(prop_block[idx].mod_highdate);

+	prop_block[idx].start_block = ole2_endian_convert_32(prop_block[idx].start_block);

+	prop_block[idx].size = ole2_endian_convert_32(prop_block[idx].size);

-	print_ole2_property(&prop_block[index]);

+	print_ole2_property(&prop_block[idx]);

 	/* Check we aren't in a loop */

 	if (cli_bitset_test(hdr->bitset, (unsigned long) prop_index)) {

@@ -525,7 +525,7 @@ static void ole2_walk_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 		return;

 	}

-	switch (prop_block[index].type) {

+	switch (prop_block[idx].type) {

 		case 5: /* Root Entry */

 			if ((prop_index != 0) || (rec_level !=0) ||

 					(*file_count != 0)) {

@@ -533,17 +533,17 @@ static void ole2_walk_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 				cli_dbgmsg("ERROR: illegal Root Entry\n");

 				return;

 			}

-			hdr->sbat_root_start = prop_block[index].start_block;

+			hdr->sbat_root_start = prop_block[idx].start_block;

 			ole2_walk_property_tree(fd, hdr, dir,

-				prop_block[index].prev, handler, rec_level+1, file_count, limits);

+				prop_block[idx].prev, handler, rec_level+1, file_count, limits);

 			ole2_walk_property_tree(fd, hdr, dir,

-				prop_block[index].next, handler, rec_level+1, file_count, limits);

+				prop_block[idx].next, handler, rec_level+1, file_count, limits);

 			ole2_walk_property_tree(fd, hdr, dir,

-				prop_block[index].child, handler, rec_level+1, file_count, limits);

+				prop_block[idx].child, handler, rec_level+1, file_count, limits);

 			break;

 		case 2: /* File */

 			(*file_count)++;

-			if (!handler(fd, hdr, &prop_block[index], dir)) {

+			if (!handler(fd, hdr, &prop_block[idx], dir)) {

 				cli_dbgmsg("ERROR: handler failed\n");

 				/* If we don't return on this error then

 					we can sometimes pull VBA code

@@ -552,11 +552,11 @@ static void ole2_walk_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 			}

 			ole2_walk_property_tree(fd, hdr, dir,

-				prop_block[index].prev, handler, rec_level, file_count, limits);

+				prop_block[idx].prev, handler, rec_level, file_count, limits);

 			ole2_walk_property_tree(fd, hdr, dir,

-				prop_block[index].next, handler, rec_level, file_count, limits);

+				prop_block[idx].next, handler, rec_level, file_count, limits);

 			ole2_walk_property_tree(fd, hdr, dir,

-				prop_block[index].child, handler, rec_level, file_count, limits);

+				prop_block[idx].child, handler, rec_level, file_count, limits);

 			break;

 		case 1: /* Directory */

 			dirname = (char *) cli_malloc(strlen(dir)+8);

@@ -570,15 +570,15 @@ static void ole2_walk_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 			}

 			cli_dbgmsg("OLE2 dir entry: %s\n",dirname);

 			ole2_walk_property_tree(fd, hdr, dir,

-				prop_block[index].prev, handler, rec_level+1, file_count, limits);

+				prop_block[idx].prev, handler, rec_level+1, file_count, limits);

 			ole2_walk_property_tree(fd, hdr, dir,

-				prop_block[index].next, handler, rec_level+1, file_count, limits);

+				prop_block[idx].next, handler, rec_level+1, file_count, limits);

 			ole2_walk_property_tree(fd, hdr, dirname,

-				prop_block[index].child, handler, rec_level+1, file_count, limits);

+				prop_block[idx].child, handler, rec_level+1, file_count, limits);

 			free(dirname);

 			break;

 		default:

-			cli_dbgmsg("ERROR: unknown OLE2 entry type: %d\n", prop_block[index].type);

+			cli_dbgmsg("ERROR: unknown OLE2 entry type: %d\n", prop_block[idx].type);

 			break;

 	}

 	return;

@@ -648,7 +648,7 @@ static int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const

 		return FALSE;

 	}

 	while((current_block >= 0) && (len > 0)) {

-		if (current_block > hdr->max_block_no) {

+		if (current_block > (int32_t) hdr->max_block_no) {

                         cli_dbgmsg("OLE2: Max block number for file size exceeded: %d\n", current_block);

                         close(ofd);

                         free(buff);

@@ -870,7 +870,7 @@ int cli_ole2_extract(int fd, const char *dirname, const struct cl_limits *limits

 	hdr.max_block_no = ((statbuf.st_size / hdr.log2_big_block_size) + 1) * 8;

 	print_ole2_header(&hdr);

-	cli_dbgmsg("Max block number: %lu\n", hdr.max_block_no);

+	cli_dbgmsg("Max block number: %lu\n", (unsigned long int) hdr.max_block_no);

 	/* NOTE: Select only ONE of the following two methods */

@@ -1,4 +1,7 @@

 /*

+ *  Copyright (C) 2007 - 2008 Sourcefire, Inc.

+ *  Author: Tomasz Kojm <tkojm@clamav.net>

+ *

  *  Copyright (C) 1999 - 2005 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

@@ -279,7 +282,7 @@ static char *cli_md5buff(const unsigned char *buffer, unsigned int len, unsigned

     cli_md5_init(&ctx);

-    cli_md5_update(&ctx, buffer, len);

+    cli_md5_update(&ctx, (char *) buffer, len);

     cli_md5_final(digest, &ctx);

     if(dig)

@@ -304,7 +307,7 @@ void *cli_malloc(size_t size)

     if(!size || size > CLI_MAX_ALLOCATION) {

-	cli_errmsg("cli_malloc(): Attempt to allocate %u bytes. Please report to http://bugs.clamav.net\n", size);

+	cli_errmsg("cli_malloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

 	return NULL;

     }

@@ -315,7 +318,7 @@ void *cli_malloc(size_t size)

 #endif

     if(!alloc) {

-	cli_errmsg("cli_malloc(): Can't allocate memory (%u bytes).\n", size);

+	cli_errmsg("cli_malloc(): Can't allocate memory (%lu bytes).\n", (unsigned long int) size);

 	perror("malloc_problem");

 	return NULL;

     } else return alloc;

@@ -327,7 +330,7 @@ void *cli_calloc(size_t nmemb, size_t size)

     if(!size || size > CLI_MAX_ALLOCATION) {

-	cli_errmsg("cli_calloc(): Attempt to allocate %u bytes. Please report to http://bugs.clamav.net\n", size);

+	cli_errmsg("cli_calloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

 	return NULL;

     }

@@ -338,7 +341,7 @@ void *cli_calloc(size_t nmemb, size_t size)

 #endif

     if(!alloc) {

-	cli_errmsg("cli_calloc(): Can't allocate memory (%u bytes).\n", nmemb * size);

+	cli_errmsg("cli_calloc(): Can't allocate memory (%lu bytes).\n", (unsigned long int) (nmemb * size));

 	perror("calloc_problem");

 	return NULL;

     } else return alloc;

@@ -350,14 +353,14 @@ void *cli_realloc(void *ptr, size_t size)

     if(!size || size > CLI_MAX_ALLOCATION) {

-	cli_errmsg("cli_realloc(): Attempt to allocate %u bytes. Please report to http://bugs.clamav.net\n", size);

+	cli_errmsg("cli_realloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

 	return NULL;

     }

     alloc = realloc(ptr, size);

     if(!alloc) {

-	cli_errmsg("cli_realloc(): Can't re-allocate memory to %u bytes.\n", size);

+	cli_errmsg("cli_realloc(): Can't re-allocate memory to %lu bytes.\n", (unsigned long int) size);

 	perror("realloc_problem");

 	return NULL;

     } else return alloc;

@@ -369,14 +372,14 @@ void *cli_realloc2(void *ptr, size_t size)

     if(!size || size > CLI_MAX_ALLOCATION) {

-	cli_errmsg("cli_realloc2(): Attempt to allocate %u bytes. Please report to http://bugs.clamav.net\n", size);

+	cli_errmsg("cli_realloc2(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

 	return NULL;

     }

     alloc = realloc(ptr, size);

     if(!alloc) {

-	cli_errmsg("cli_realloc2(): Can't re-allocate memory to %u bytes.\n", size);

+	cli_errmsg("cli_realloc2(): Can't re-allocate memory to %lu bytes.\n", (unsigned long int) size);

 	perror("realloc_problem");

 	if(ptr)

 	    free(ptr);

@@ -401,7 +404,7 @@ char *cli_strdup(const char *s)

 #endif

     if(!alloc) {

-        cli_errmsg("cli_strdup(): Can't allocate memory (%u bytes).\n", strlen(s));

+        cli_errmsg("cli_strdup(): Can't allocate memory (%u bytes).\n", (unsigned int) strlen(s));

         perror("strdup_problem");

         return NULL;

     }

@@ -868,8 +871,10 @@ const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize)

 	}

 #ifdef HAVE_CTIME_R	

 # ifdef HAVE_CTIME_R_2

-	char* y = ctime_r(timep, buf);

-	return y;

+	{

+	    char* y = ctime_r(timep, buf);

+	    return y;

+	}

 # else

 	return ctime_r(timep, buf, bufsize);

 # endif

@@ -1,4 +1,7 @@

 /*

+ *  Copyright (C) 2007 - 2008 Sourcefire, Inc.

+ *  Author: Tomasz Kojm <tkojm@clamav.net>

+ *

  *  Copyright (C) 1999 - 2005 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

@@ -881,7 +881,7 @@ static int cli_loadmd5(FILE *fs, struct cl_engine **engine, unsigned int *signo,

 static int cli_loadmd(FILE *fs, struct cl_engine **engine, unsigned int *signo, int type, unsigned int options, gzFile *gzs, unsigned int gzrsize)

 {

 	char buffer[FILEBUFF], *pt;

-	int line = 0, comments = 0, ret = 0, crc32;

+	int line = 0, comments = 0, ret = 0, crc;

 	struct cli_meta_node *new;

@@ -971,12 +971,12 @@ static int cli_loadmd(FILE *fs, struct cl_engine **engine, unsigned int *signo,

 	    if(!strcmp(pt, "*")) {

 		new->crc32 = 0;

 	    } else {

-		crc32 = cli_hex2num(pt);

-		if(crc32 == -1) {

+		crc = cli_hex2num(pt);

+		if(crc == -1) {

 		    ret = CL_EMALFDB;

 		    break;

 		}

-		new->crc32 = (unsigned int) crc32;

+		new->crc32 = (unsigned int) crc;

 	    }

 	    free(pt);

 	}

@@ -1206,7 +1206,6 @@ static int cli_scanmschm(int desc, cli_ctx *ctx)

 	int ret = CL_CLEAN, rc;

 	chm_metadata_t metadata;

 	char *dir;

-	unsigned int file_count = 1;

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

@@ -1321,9 +1321,3 @@ create_vba_project(int record_count, const char *dir)

 	return ret;

 }

-

-static uint32_t

-sigtouint32(const unsigned char *fourbytes)

-{

-	return (uint32_t)((*fourbytes++ << 24) | (*fourbytes++ << 16) | (*fourbytes++ << 8) | *fourbytes);

-}