libclamav: fix compilation error with Sun's compiler

git-svn: trunk@722

clamav-devel/ChangeLog

@@ -1,3 +1,8 @@
+Wed Aug  4 20:01:26 CEST 2004 (tk)
+----------------------------------
+  * libclamav: fix compilation error with Sun's compiler (reported by
+	       Alex S Moore <asmoore*edge.net>)
+
 Wed Aug  4 19:06:52 CEST 2004 (tk)
 ----------------------------------
   * libclamav: re-activate new mail detection mechanism

clamav-devel/libclamav/clamav.h

@@ -98,7 +98,8 @@ struct cli_ac_node {
 };
 
 struct cli_md5_node {
-    char *virname, *viralias, *md5;
+    char *virname, *viralias;
+    unsigned char *md5;
     unsigned int size;
     struct cli_md5_node *next;
 };

clamav-devel/libclamav/matcher.c

@@ -57,7 +57,7 @@ int cl_scanbuff(const char *buffer, unsigned int length, const char **virname, c
     return ret;
 }
 
-static struct cli_md5_node *cli_vermd5(const char *md5, const struct cl_node *root)
+static struct cli_md5_node *cli_vermd5(const unsigned char *md5, const struct cl_node *root)
 {
 	struct cli_md5_node *pt;
 
@@ -242,5 +242,5 @@ int cl_buildtrie(struct cl_node *root) /* for backward compatibility */
 
 void cl_freetrie(struct cl_node *root) /* for backward compatibility */
 {
-    return cl_free(root);
+    cl_free(root);
 }

clamav-devel/libclamav/readdb.c

@@ -482,7 +482,7 @@ static int cli_loadhdb(FILE *fd, struct cl_node **root, int *virnum)
 	    break;
 	}
 
-	if(!(new->md5 = cli_hex2str(pt))) {
+	if(!(new->md5 = (unsigned char *) cli_hex2str(pt))) {
 	    cli_errmsg("Malformed MD5 string at line %d\n", line);
 	    free(pt);
 	    free(new);