From 7ff1619df0d9c4fc58119bd23e8e6904679db8b6 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Wed, 11 Jan 2006 10:51:28 +0000
Subject: [PATCH] Fix a few compiler warnings through casts. Make MD5Update
 argument const.

svn path=/branches/BRANCH_6-3/; revision=4621
---
 conf.c      | 6 +++---
 driver.c    | 4 ++--
 fetchmail.h | 2 +-
 md5.h       | 2 +-
 md5ify.c    | 6 +++---
 odmr.c      | 4 ++--
 socket.c    | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/conf.c b/conf.c
index 30c2e482..edec8ee0 100644
--- a/conf.c
+++ b/conf.c
@@ -103,7 +103,7 @@ static void listdump(const char *name, struct idlist *list)
 	for (idp = list; idp; idp = idp->next)
 	    if (idp->id)
 	    {
-		fprintf(stdout, "\"%s\"", visbuf(idp->id));
+		fprintf(stdout, "\"%s\"", visbuf((const char *)idp->id));
 		if (idp->next)
 		    fputs(", ", stdout);
 	    }
@@ -325,9 +325,9 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	{
 	    char namebuf[USERNAMELEN + 1];
 
-	    strlcpy(namebuf, visbuf(idp->id), sizeof(namebuf));
+	    strlcpy(namebuf, visbuf((const char *)idp->id), sizeof(namebuf));
 	    if (idp->val.id2)
-		fprintf(stdout, "(\"%s\", %s)", namebuf, visbuf(idp->val.id2));
+		fprintf(stdout, "(\"%s\", %s)", namebuf, visbuf((const char *)idp->val.id2));
 	    else
 		fprintf(stdout, "\"%s\"", namebuf);
 	    if (idp->next)
diff --git a/driver.c b/driver.c
index 320d1056..a807b6e4 100644
--- a/driver.c
+++ b/driver.c
@@ -358,7 +358,7 @@ static void send_size_warnings(struct query *ctl)
 	if (current->val.status.num == 0 && current->val.status.mark)
 	{
 	    nbr = current->val.status.mark;
-	    size = atoi(current->id);
+	    size = atoi((const char *)current->id);
 	    if (ctl->limitflush)
 		stuff_warning(NULL, ctl,
 			GT_("  %d msg %d octets long deleted by fetchmail."),
@@ -1304,7 +1304,7 @@ is restored."));
 
 		/* compute # of messages and number of new messages waiting */
 		stage = STAGE_GETRANGE;
-		err = (ctl->server.base_protocol->getrange)(mailserver_socket, ctl, idp->id, &count, &new, &bytes);
+		err = (ctl->server.base_protocol->getrange)(mailserver_socket, ctl, (const char *)idp->id, &count, &new, &bytes);
 		if (err != 0)
 		    goto cleanUp;
 
diff --git a/fetchmail.h b/fetchmail.h
index dfafd2b5..4066facd 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -643,7 +643,7 @@ extern char currentwd[1024], rcfiledir[1024];
 struct query *hostalloc(struct query *); 
 int parsecmdline (int, char **, struct runctl *, struct query *);
 char *prependdir (const char *, const char *);
-char *MD5Digest (unsigned char *);
+char *MD5Digest (unsigned const char *);
 void hmac_md5 (unsigned char *, size_t, unsigned char *, size_t, unsigned char *, size_t);
 int POP3_auth_rpa(unsigned char *, unsigned char *, int socket);
 typedef RETSIGTYPE (*SIGHANDLERTYPE) (int);
diff --git a/md5.h b/md5.h
index c396a8dc..77e70e66 100644
--- a/md5.h
+++ b/md5.h
@@ -25,7 +25,7 @@ void MD5Update(struct MD5Context *context, unsigned char const *buf,
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
 void MD5Transform(uint32 buf[4], uint32 const in[16]);
 
-char *MD5Digest (unsigned char *s);
+char *MD5Digest (unsigned const char *s);
 
 /*
  * This is needed to make RSAREF happy on some MS-DOS compilers.
diff --git a/md5ify.c b/md5ify.c
index 79980d1c..8d5c8807 100644
--- a/md5ify.c
+++ b/md5ify.c
@@ -20,7 +20,7 @@
 #include "md5.h"
 
 char *
-MD5Digest (unsigned char *s)
+MD5Digest (unsigned const char *s)
 {
   int i;
   MD5_CTX context;
@@ -28,9 +28,9 @@ MD5Digest (unsigned char *s)
   static char ascii_digest [33];
 
   MD5Init(&context);
-  MD5Update(&context, s, strlen(s));
+  MD5Update(&context, s, strlen((const char *)s));
   MD5Final(digest, &context);
-  
+
   for (i = 0;  i < 16;  i++) 
     sprintf(ascii_digest+2*i, "%02x", digest[i]);
  
diff --git a/odmr.c b/odmr.c
index 18ef2e63..e1fce32d 100644
--- a/odmr.c
+++ b/odmr.c
@@ -80,11 +80,11 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
      */
     buf[0] = '\0';
     for (qnp = ctl->domainlist; qnp; qnp = qnp->next)
-	if (strlen(buf) + strlen(qnp->id) + 1 >= sizeof(buf))
+	if (strlen(buf) + strlen((const char *)qnp->id) + 1 >= sizeof(buf))
 	    break;
 	else
 	{
-	    strcat(buf, qnp->id);
+	    strcat(buf, (const char *)qnp->id);
 	    strcat(buf, ",");
 	}
     buf[strlen(buf) - 1] = '\0';	/* nuke final comma */
diff --git a/socket.c b/socket.c
index 4c3c17d3..7a62ffc1 100644
--- a/socket.c
+++ b/socket.c
@@ -659,7 +659,7 @@ static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
 					for (i = 0, r = sk_GENERAL_NAME_num(gens); i < r; ++i) {
 						const GENERAL_NAME *gn = sk_GENERAL_NAME_value(gens, i);
 						if (gn->type == GEN_DNS) {
-							char *p1 = gn->d.ia5->data;
+							char *p1 = (char *)gn->d.ia5->data;
 							char *p2 = _ssl_server_cname;
 							if (outlevel >= O_VERBOSE)
 								report(stderr, "Subject Alternative Name: %s\n", p1);
-- 
2.43.2