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

+Sat Oct  6 10:47:26 EEST 2007 (edwin)

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

+  * libclamav/phish*.[ch], regex_list.c, rtf.c: fix some warnings

+

 Sat Oct  6 01:10:40 CEST 2007 (tk)

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

   * clamd/server-th.c: shutdown conn->sd when exiting scanner_thread() (bb#674)

@@ -44,7 +44,7 @@

 #include "phish_domaincheck_db.h"

 #include "regex_list.h"

-int domainlist_match(const struct cl_engine* engine,const char* real_url,const char* display_url,const struct pre_fixup_info* pre_fixup,int hostOnly,unsigned short* flags)

+int domainlist_match(const struct cl_engine* engine,char* real_url,const char* display_url,const struct pre_fixup_info* pre_fixup,int hostOnly,unsigned short* flags)

 {

 	const char* info;

 	int rc = engine->domainlist_matcher ? regex_list_match(engine->domainlist_matcher,real_url,display_url,hostOnly ? pre_fixup : NULL,hostOnly,&info,0) : 0;

@@ -28,7 +28,7 @@ int init_domainlist(struct cl_engine* engine);

 void domainlist_done(struct cl_engine* engine);

 void domainlist_cleanup(const struct cl_engine* engine);

 int is_domainlist_ok(const struct cl_engine* engine);

-int domainlist_match(const struct cl_engine* engine,const char* real_url,const char* display_url,const struct pre_fixup_info* pre_fixup, int hostOnly,unsigned short* flags);

+int domainlist_match(const struct cl_engine* engine,char* real_url,const char* display_url,const struct pre_fixup_info* pre_fixup, int hostOnly,unsigned short* flags);

 #endif

@@ -44,7 +44,7 @@

 #include "phish_whitelist.h"

 #include "regex_list.h"

-int whitelist_match(const struct cl_engine* engine,const char* real_url,const char* display_url,int hostOnly)

+int whitelist_match(const struct cl_engine* engine,char* real_url,const char* display_url,int hostOnly)

 {

 	const char* info;/*unused*/

 	cli_dbgmsg("Phishing: looking up in whitelist: %s:%s; host-only:%d\n",real_url,display_url,hostOnly);

@@ -29,7 +29,7 @@ int init_whitelist(struct cl_engine* engine);

 void whitelist_done(struct cl_engine* engine);

 void whitelist_cleanup(const struct cl_engine* engine);

 int is_whitelist_ok(const struct cl_engine* engine);

-int whitelist_match(const struct cl_engine* engine, const char* real_url,const char* display_url,int hostOnly);

+int whitelist_match(const struct cl_engine* engine, char* real_url,const char* display_url,int hostOnly);

 #endif

@@ -36,7 +36,7 @@

 /* TODO: when implementation of new version is complete, enable it in CL_EXPERIMENTAL */

 #ifdef CL_EXPERIMENTAL

-//#define USE_NEW_VERSION

+/*#define USE_NEW_VERSION*/

 #endif

 #ifndef USE_NEW_VERSION

@@ -228,7 +228,7 @@ static inline size_t get_char_at_pos_with_skip(const struct pre_fixup_info* info

 		return (pos <= strlen(buffer)) ? buffer[pos>0 ? pos-1:0] : '\0';

 	}

 	str = info->pre_displayLink.data;

-	cli_dbgmsg("calc_pos_with_skip: skip:%u, %u - %u \"%s\",\"%s\"\n", pos, info->host_start, info->host_end, str, buffer);

+	cli_dbgmsg("calc_pos_with_skip: skip:%lu, %lu - %lu \"%s\",\"%s\"\n", pos, info->host_start, info->host_end, str, buffer);

 	pos += info->host_start;

 	while(str[realpos] && !isalnum(str[realpos])) realpos++;

 	for(; str[realpos] && (pos>0); pos--) {

@@ -392,7 +392,7 @@ static int rtf_object_process(struct rtf_state* state, const unsigned char* inpu

 						    if(data->bread == 4) {

 							    out_data += i;

 							    data->bread=0;

-							    cli_dbgmsg("Dumping rtf embedded object of size:%ld\n",data->desc_len);

+							    cli_dbgmsg("Dumping rtf embedded object of size:%lu\n",data->desc_len);

 							    if((ret = cli_gentempfd(data->tmpdir, &data->name, &data->fd)))

 								    return ret;

 							    data->internal_state = DUMP_DATA;