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

+Sun Feb  4 17:58:16 CET 2007 (tk)

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

+  * libclamav: remove some warnings from gcc

+

 Sun Feb  4 00:33:54 CET 2007 (tk)

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

   * sigtool/sigtool.c: --build now allows to manually specify path to current

@@ -126,7 +126,7 @@ static const struct cli_magic_s cli_magic[] = {

     /* Others */

     {0,  "\320\317\021\340\241\261\032\341", 8, "OLE2 container", CL_TYPE_MSOLE2},

-    {0,  "\%PDF-",			 5, "PDF document", CL_TYPE_PDF},

+    {0,  "%PDF-",			 5, "PDF document", CL_TYPE_PDF},

     {0,  "\266\271\254\256\376\377\377\377", 8, "CryptFF", CL_TYPE_CRYPTFF},

     {0,  "{\\rtf",                           5, "RTF", CL_TYPE_RTF}, 

@@ -137,7 +137,7 @@ static const struct cli_magic_s cli_magic[] = {

     {0,  "OggS",                         4, "Ogg Stream",         CL_TYPE_DATA},

     {0,  "ID3",				 3, "MP3",		  CL_TYPE_DATA},

     {0,  "\377\373\220",		 3, "MP3",		  CL_TYPE_DATA},

-    {0,  "\%!PS-Adobe-",		11, "PostScript",	  CL_TYPE_DATA},

+    {0,  "%!PS-Adobe-",			11, "PostScript",	  CL_TYPE_DATA},

     {0,  "\060\046\262\165\216\146\317", 7, "WMA/WMV/ASF",	  CL_TYPE_DATA},

     {0,  ".RMF" ,			 4, "Real Media File",	  CL_TYPE_DATA},

@@ -272,9 +272,9 @@ cli_file_t cli_filetype2(int desc, const struct cl_engine *engine)

 	    if(cli_ac_initdata(&mdata, root->ac_partsigs, AC_DEFAULT_TRACKLEN))

 		return ret;

-	    decoded = cli_utf16toascii(smallbuff, bread);

+	    decoded = (unsigned char *) cli_utf16toascii((char *) smallbuff, bread);

 	    if(decoded) {

-		sret = cli_ac_scanbuff(decoded, strlen(decoded), NULL, engine->root[0], &mdata, 1, 0, 0, -1, NULL);

+		sret = cli_ac_scanbuff(decoded, strlen((char *) decoded), NULL, engine->root[0], &mdata, 1, 0, 0, -1, NULL);

 		free(decoded);

 		if(sret == CL_TYPE_HTML)

 		    ret = CL_TYPE_HTML_UTF16;

@@ -124,7 +124,7 @@ struct cli_md5_node *cli_vermd5(const unsigned char *md5, const struct cl_engine

 off_t cli_caloff(const char *offstr, struct cli_target_info *info, int fd, cli_file_t ftype, int *ret)

 {

 	int (*einfo)(int, struct cli_exe_info *) = NULL;

-	unsigned int n;

+	unsigned int n, val;

 	off_t pos, offset;

@@ -176,16 +176,16 @@ off_t cli_caloff(const char *offstr, struct cli_target_info *info, int fd, cli_f

 	if(!strncmp(offstr, "SL", 2) && info->exeinfo.section[info->exeinfo.nsections - 1].rsz) {

-	    if(sscanf(offstr, "SL+%lu", &offset) != 1) {

+	    if(sscanf(offstr, "SL+%u", &val) != 1) {

 		*ret = -1;

 		return 0;

 	    }

-	    offset += info->exeinfo.section[info->exeinfo.nsections - 1].raw;

+	    offset = val + info->exeinfo.section[info->exeinfo.nsections - 1].raw;

 	} else {

-	    if(sscanf(offstr, "S%u+%lu", &n, &offset) != 2) {

+	    if(sscanf(offstr, "S%u+%u", &n, &val) != 2) {

 		*ret = -1;

 		return 0;

 	    }

@@ -195,7 +195,7 @@ off_t cli_caloff(const char *offstr, struct cli_target_info *info, int fd, cli_f

 		return 0;

 	    }

-	    offset += info->exeinfo.section[n].raw;

+	    offset = val + info->exeinfo.section[n].raw;

 	}

 	return offset;

@@ -69,8 +69,8 @@

 typedef struct ole2_header_tag

 {

-	unsigned char magic[8] __attribute__ ((packed));		/* should be: 0xd0cf11e0a1b11ae1 */

-	unsigned char clsid[16] __attribute__ ((packed));

+	unsigned char magic[8];		/* should be: 0xd0cf11e0a1b11ae1 */

+	unsigned char clsid[16];

 	uint16_t minor_version __attribute__ ((packed));

 	uint16_t dll_version __attribute__ ((packed));

 	int16_t byte_order __attribute__ ((packed));			/* -2=intel */

@@ -102,15 +102,15 @@ typedef struct ole2_header_tag

 typedef struct property_tag

 {

-	unsigned char name[64] __attribute__ ((packed));		/* in unicode */

+	char name[64];		/* in unicode */

 	uint16_t name_size __attribute__ ((packed));

-	unsigned char type __attribute__ ((packed));			/* 1=dir 2=file 5=root */

-	unsigned char color __attribute__ ((packed));			/* black or red */

+	unsigned char type;		/* 1=dir 2=file 5=root */

+	unsigned char color;		/* black or red */

 	uint32_t prev __attribute__ ((packed));

 	uint32_t next __attribute__ ((packed));

 	uint32_t child __attribute__ ((packed));

-	unsigned char clsid[16] __attribute__ ((packed));

+	unsigned char clsid[16];

 	uint32_t user_flags __attribute__ ((packed));

 	uint32_t create_lowdate __attribute__ ((packed));

@@ -119,14 +119,14 @@ typedef struct property_tag

 	uint32_t mod_highdate __attribute__ ((packed));

 	uint32_t start_block __attribute__ ((packed));

 	uint32_t size __attribute__ ((packed));

-	unsigned char reserved[4] __attribute__ ((packed));

+	unsigned char reserved[4];

 } property_t;

 #ifdef HAVE_PRAGMA_PACK

 #pragma pack()

 #endif

-unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1};

+static unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1};

 static char *get_property_name(char *name, int size)

 {

@@ -402,6 +402,7 @@ static int32_t ole2_get_sbat_data_block(int fd, ole2_header_t *hdr, void *buff,

 /* Read the property tree.

    It is read as just an array rather than a tree */

+/*

 static void ole2_read_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 				int (*handler)(int fd, ole2_header_t *hdr, property_t *prop, const char *dir))

 {

@@ -443,7 +444,6 @@ static void ole2_read_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 			}

 		}

 		current_block = ole2_get_next_block_number(fd, hdr, current_block);

-		/* Loop detection */

 		if (++count > 100000) {

 			cli_dbgmsg("ERROR: loop detected\n");

 			return;

@@ -451,14 +451,15 @@ static void ole2_read_property_tree(int fd, ole2_header_t *hdr, const char *dir,

 	}

 	return;

 }

+*/

 static void ole2_walk_property_tree(int fd, ole2_header_t *hdr, const char *dir, int32_t prop_index,

 				int (*handler)(int fd, ole2_header_t *hdr, property_t *prop, const char *dir),

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

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

 {

 	property_t prop_block[4];

 	int32_t index, current_block, i;

-	unsigned char *dirname;

+	char *dirname;

 	current_block = hdr->prop_start;

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

 	return TRUE;

 }

+#if !defined(HAVE_ATTRIB_PACKED) && !defined(HAVE_PRAGMA_PACK)

 static int ole2_read_header(int fd, ole2_header_t *hdr)

 {

 	int i;

@@ -731,13 +733,14 @@ static int ole2_read_header(int fd, ole2_header_t *hdr)

 	}

 	return TRUE;

 }

+#endif

 int cli_ole2_extract(int fd, const char *dirname, const struct cl_limits *limits)

 {

 	ole2_header_t hdr;

 	int hdr_size;

 	struct stat statbuf;

-	int file_count=0;

+	unsigned int file_count=0;

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

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

 		return CL_EOLE2;

 	}

-	if (strncmp(hdr.magic, magic_id, 8) != 0) {

+	if (memcmp(hdr.magic, magic_id, 8) != 0) {

 		cli_dbgmsg("OLE2 magic failed!\n");

 #ifdef HAVE_MMAP

 		if (hdr.m_area != NULL) {

@@ -444,7 +444,7 @@ static int rtf_object_end(struct rtf_state* state,cli_ctx* ctx)

 }

-static void rtf_action(struct rtf_state* state,long action, const char* tempname,cli_ctx* ctx)

+static void rtf_action(struct rtf_state* state,long action)

 {

 	switch(action) {

 		case RTF_OBJECT:

@@ -652,7 +652,7 @@ int cli_scanrtf(int desc, cli_ctx *ctx)

 						state.controlword[state.controlword_cnt] = '\0';

 						action = tableFind(actiontable, state.controlword);

 						if(action != -1)

-							rtf_action(&state,action, tempname, ctx);

+							rtf_action(&state,action);

 						state.parse_state = PARSE_MAIN;

 						break;

 					}

@@ -121,7 +121,7 @@ typedef struct mark_header_tag

 typedef struct main_header_tag

 {

 	uint16_t head_crc __attribute__ ((packed));

-	uint8_t head_type __attribute__ ((packed));

+	uint8_t head_type;

 	uint16_t flags __attribute__ ((packed));

 	uint16_t head_size __attribute__ ((packed));

 	uint16_t highposav __attribute__ ((packed));

@@ -131,16 +131,16 @@ typedef struct main_header_tag

 typedef struct file_header_tag

 {

 	uint16_t head_crc __attribute__ ((packed));

-	uint8_t head_type __attribute__ ((packed));

+	uint8_t head_type;

 	uint16_t flags __attribute__ ((packed));

 	uint16_t head_size __attribute__ ((packed));

 	uint32_t pack_size __attribute__ ((packed));

 	uint32_t unpack_size __attribute__ ((packed));

-	uint8_t host_os __attribute__ ((packed));

+	uint8_t host_os;

 	uint32_t file_crc __attribute__ ((packed));

 	uint32_t file_time __attribute__ ((packed));

-	uint8_t unpack_ver __attribute__ ((packed));

-	uint8_t method __attribute__ ((packed));

+	uint8_t unpack_ver;

+	uint8_t method;

 	uint16_t name_size __attribute__ ((packed));

 	uint32_t file_attr __attribute__ ((packed));

 	uint32_t high_pack_size __attribute__ ((packed));   /* optional */

@@ -153,12 +153,12 @@ typedef struct file_header_tag

 typedef struct comment_header_tag

 {

 	uint16_t head_crc __attribute__ ((packed));

-	uint8_t head_type __attribute__ ((packed));

+	uint8_t head_type;

 	uint16_t flags __attribute__ ((packed));

 	uint16_t head_size __attribute__ ((packed));

 	uint16_t unpack_size __attribute__ ((packed));

-	uint8_t unpack_ver __attribute__ ((packed));

-	uint8_t method __attribute__ ((packed));

+	uint8_t unpack_ver;

+	uint8_t method;

 	uint16_t comm_crc __attribute__ ((packed));

 } comment_header_t;

@@ -59,7 +59,7 @@ typedef enum rarvm_standard_filters {

 enum VM_Flags {

 	VM_FC=1,

 	VM_FZ=2,

-	VM_FS=0x80000000,

+	VM_FS=0x80000000

 };

 enum rarvm_op_type {