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

+Wed Jan 19 00:58:40 CET 2005 (tk)

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

+  * libclamav/str.c: cli_memstr: fix casting on 64bit platforms (thanks to

+		     Carlo Marcelo Arenas Belon <carenas*sajinet.com.pe>)

+

 Wed Jan 19 00:48:48 CET 2005 (tk)

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

   * improve OS/2 support (patch by Yuri Dario <mc6530*mclink.it>)

@@ -270,7 +270,7 @@ char *cli_strtokbuf(const char *input, int fieldno, const char *delim, char *out

     return output;

 }

-char *cli_memstr(const char *haystack, int hs, const char *needle, int ns)

+const char *cli_memstr(const char *haystack, int hs, const char *needle, int ns)

 {

 	const char *pt, *hay;

 	int n;

@@ -289,7 +289,7 @@ char *cli_memstr(const char *haystack, int hs, const char *needle, int ns)

     n = hs;

     while((pt = memchr(hay, needle[0], n)) != NULL) {

-	n -= (int) pt - (int) hay;

+	n -= (int) (pt - hay);

 	if(n < ns)

 	    break;

@@ -26,6 +26,6 @@ short int *cli_hex2si(const char *hex);

 char *cli_hex2str(const char *hex);

 char *cli_str2hex(const char *string, unsigned int len);

 char *cli_strtokbuf(const char *input, int fieldno, const char *delim, char *output);

-char *cli_memstr(const char *haystack, int hs, const char *needle, int ns);

+const char *cli_memstr(const char *haystack, int hs, const char *needle, int ns);

 #endif