[Pkg-wmaker-commits] [wmbiff] 12/32: a little -Wshadow and -Wcast-qual cleanup (or, eliminate the use of 'index' as a variable name)

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_3_8
in repository wmbiff.

commit 3230a1273be14ce6011357744a2ff1a6b4defd9a
Author: bluehal <bluehal>
Date:   Sat Mar 2 23:25:08 2002 +0000

    a little -Wshadow and -Wcast-qual cleanup (or, eliminate the use of 'index' as a variable name)
---
 wmbiff/Imap4Client.c |  4 ++--
 wmbiff/Makefile      |  4 ++--
 wmbiff/wmbiff.c      | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wmbiff/Imap4Client.c b/wmbiff/Imap4Client.c
index 2fcb80f..825c29f 100644
--- a/wmbiff/Imap4Client.c
+++ b/wmbiff/Imap4Client.c
@@ -38,7 +38,7 @@ void asprintf( /*@out@ */ char **out, char *fmt, ...);
    number of different mailboxes displayed. */
 #define FDMAP_SIZE 5
 static struct fdmap_struct {
-	const char *user_password_server_port;	/* tuple, in string form */
+	char *user_password_server_port;	/* tuple, in string form */
 	/*@owned@ */ struct connection_state *cs;
 } fdmap[FDMAP_SIZE];
 
@@ -121,7 +121,7 @@ struct connection_state *unbind( /*@returned@ */ struct connection_state
 
 	for (i = 0; i < FDMAP_SIZE && fdmap[i].cs != scs; i++);
 	if (i < FDMAP_SIZE) {
-		free((char *) fdmap[i].user_password_server_port);
+		free(fdmap[i].user_password_server_port);
 		retval = fdmap[i].cs;
 		fdmap[i].cs = NULL;
 	}
diff --git a/wmbiff/Makefile b/wmbiff/Makefile
index 9f56914..072d300 100644
--- a/wmbiff/Makefile
+++ b/wmbiff/Makefile
@@ -1,6 +1,6 @@
 # Makefile for wmbiff
 #
-# $Id: Makefile,v 1.25 2002/03/02 06:31:38 bluehal Exp $
+# $Id: Makefile,v 1.26 2002/03/02 23:25:08 bluehal Exp $
 
 # Disable gnutls crypto?
 #WITHOUT_CRYPTO=	1
@@ -34,7 +34,7 @@ INSTALL_GROUP=	root
 # Debugging
 ifdef DEBUG
 CFLAGS=		-g -Wall -Wpointer-arith -Wwrite-strings \
--W -Wtraditional
+-W -Wtraditional -Wshadow -Wcast-qual
 #-pedantic  -Wmissing-noreturn
 endif
 
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index 73c0de4..f3aee13 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -1,4 +1,4 @@
-/* $Id: wmbiff.c,v 1.14 2002/03/02 06:36:33 bluehal Exp $ */
+/* $Id: wmbiff.c,v 1.15 2002/03/02 23:25:08 bluehal Exp $ */
 
 #define	USE_POLL
 
@@ -426,7 +426,7 @@ void ClearDigits(int i)
 	index takes its value... if not index will get -1 
 	Returns -1 if no setting=value
 */
-int ReadLine(FILE * fp, char *setting, char *value, int *index)
+int ReadLine(FILE * fp, char *setting, char *value, int *mbox_index)
 {
 	char buf[BUF_SIZE];
 	char *p, *q;
@@ -467,12 +467,12 @@ int ReadLine(FILE * fp, char *setting, char *value, int *index)
 		aux = setting[len] - 48;
 		if (aux > -1 && aux < 5) {
 			setting[len] = 0;
-			*index = aux;
+			*mbox_index = aux;
 		}
 	} else
-		*index = -1;
+		*mbox_index = -1;
 
-	DMA(DEBUG_INFO, "@%s.%d=%s@\n", setting, *index, value);
+	DMA(DEBUG_INFO, "@%s.%d=%s@\n", setting, *mbox_index, value);
 	return 1;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git