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

+Tue Dec 19 21:28:09 CET 2006 (tk)

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

+  * libclamav/phishcheck.c, regex_list.c: fix some compiler warnings, patch

+					  from Edvin

+

 Tue Dec 19 21:13:23 CET 2006 (tk)

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

   * libclamav/cab.c: extract stored files

@@ -19,6 +19,9 @@

  *  MA 02110-1301, USA.

  *

  *  $Log: phishcheck.c,v $

+ *  Revision 1.15  2006/12/19 20:30:17  tkojm

+ *  fix some compiler warnings

+ *

  *  Revision 1.14  2006/10/14 23:52:01  tkojm

  *  code cleanup

  *

@@ -496,7 +499,7 @@ int get_host(const struct phishcheck* s,struct string* dest,const char* URL,int

 	const char* end=NULL;

 	if(!URL) {

 		string_assign_null(dest);

-		return;

+		return 0;

 	}

 	start = strstr(URL,"://");

 	if(!start) {

@@ -563,8 +566,9 @@ int get_host(const struct phishcheck* s,struct string* dest,const char* URL,int

 			end  = start + strlen(start);

 	}

-	if(rc = string_assign_dup(dest,start,end))

+	if(( rc = string_assign_dup(dest,start,end) ))

 		return rc;

+	return 0;

 }

 int isCountryCode(const struct phishcheck* s,const char* str)

@@ -861,14 +865,14 @@ cleanupURL(struct string *URL, int isReal)

 	len = strlen(begin);

 	if(len == 0) {

 		string_assign_null(URL);

-		return;

+		return 0;

 	}

 	end = begin + len - 1;

 	/*cli_dbgmsg("%d %d\n", end-begin, len);*/

 	if(begin >= end) {

 		string_assign_null(URL);

-		return;

+		return 0;

 	}

 	while(isspace(*end))

 		end--;

@@ -895,10 +899,11 @@ cleanupURL(struct string *URL, int isReal)

 		/* convert %xx to real value */

 		str_hex_to_char(&begin,&end);

 		str_fixup_spaces(&begin,&end);

-		if (rc = string_assign_dup(URL,begin,end+1))

+		if (( rc = string_assign_dup(URL,begin,end+1) ))

 			return rc;

 		/*cli_dbgmsg("%p::%s\n",URL->data,URL->data);*/

 	}

+	return 0;

 }

 void get_redirected_URL(struct string* URL)

@@ -19,6 +19,9 @@

  *  MA 02110-1301, USA.

  *

  *  $Log: regex_list.c,v $

+ *  Revision 1.17  2006/12/19 20:30:17  tkojm

+ *  fix some compiler warnings

+ *

  *  Revision 1.16  2006/12/02 00:42:44  tkojm

  *  add functionality level support for .pdb/.wdb files

  *

@@ -527,7 +530,7 @@ static int add_regex_list_element(struct cli_matcher* root,const char* pattern,c

        return CL_SUCCESS;

 }

-int functionality_level_check(char* line)

+static int functionality_level_check(char* line)

 {

 	char* ptmin;

 	char* ptmax;

@@ -543,9 +546,9 @@ int functionality_level_check(char* line)

 	if(!ptmax) 

 		return CL_SUCCESS;/* there is no functionality level specified, so we're ok */

 	else {

-		int min, max;

+		size_t min, max;

 		ptmax++;

-		for(j=0;j<ptmax-ptmin-1;j++)

+		for(j=0;j+ptmin+1 < ptmax;j++)

 			if(!isdigit(ptmin[j])) 

 				return CL_SUCCESS;/* not numbers, not functionality level */

 		for(j=0;j<strlen(ptmax);j++)

@@ -557,8 +560,6 @@ int functionality_level_check(char* line)

  			max = INT_MAX; 		

 		else

 			max = atoi(ptmax);

-		if(min<0) min=0;

-		if(max<0) max=0;

 		if(min > cl_retflevel()) {

 			cli_dbgmsg("regex list line %s not loaded (required f-level: %d)\n",line,min);