Fix a few Intel C++ remarks and warnings.

6 files changed, 12 insertions, 16 deletions

diff --git a/fetchmail.c b/fetchmail.c
index 6d63c714..93ce7128 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1900,17 +1900,14 @@ static void dump_params (struct runctl *runp,
 
 			if (ctl->server.akalist)
 			{
-			    struct idlist *idp;
-
 			    printf(GT_("  Predeclared mailserver aliases:"));
 			    for (idp = ctl->server.akalist; idp; idp = idp->next)
 				printf(" %s", idp->id);
 			    putchar('\n');
 			}
+
 			if (ctl->server.localdomains)
 			{
-			    struct idlist *idp;
-
 			    printf(GT_("  Local domains:"));
 			    for (idp = ctl->server.localdomains; idp; idp = idp->next)
 				printf(" %s", idp->id);
diff --git a/netrc.c b/netrc.c
index de29cc8c..8bfa19d8 100644
--- a/netrc.c
+++ b/netrc.c
@@ -331,7 +331,7 @@ free_netrc(netrc_entry *a) {
 int main (int argc, char **argv)
 {
     struct stat sb;
-    char *program_name, *file, *host, *login;
+    char *file, *host, *login;
     netrc_entry *head, *a;
 
     program_name = argv[0];
diff --git a/odmr.c b/odmr.c
index 9efafe08..d495e9cd 100644
--- a/odmr.c
+++ b/odmr.c
@@ -152,7 +152,6 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 	{
 	    fd_set	readfds;
 	    struct timeval timeout;
-	    char	buf[MSGBUFSIZE];
 
 	    FD_ZERO(&readfds);
 	    FD_SET(sock, &readfds);
diff --git a/pop3.c b/pop3.c
index b1f9621c..741a5319 100644
--- a/pop3.c
+++ b/pop3.c
@@ -693,7 +693,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 	strcpy((char *)ctl->digest, MD5Digest((unsigned char *)msg));
 	free(msg);
 
-	ok = gen_transact(sock, "APOP %s %s", ctl->remotename, ctl->digest);
+	ok = gen_transact(sock, "APOP %s %s", ctl->remotename, (char *)ctl->digest);
 	break;
 
     case P_RPOP:
@@ -856,7 +856,7 @@ static int pop3_fastuidl( int sock,  struct query *ctl, unsigned int count, int
 	    if (mark == UID_DELETED || mark == UID_EXPUNGED)
 	    {
 		if (outlevel >= O_VERBOSE)
-		    report(stderr, GT_("id=%s (num=%d) was deleted, but is still present!\n"), id, try_nr);
+		    report(stderr, GT_("id=%s (num=%u) was deleted, but is still present!\n"), id, try_nr);
 		/* just mark it as seen now! */
 		newl->val.status.mark = mark = UID_SEEN;
 	    }
diff --git a/transact.c b/transact.c
index 364a85a0..b01c2f37 100644
--- a/transact.c
+++ b/transact.c
@@ -749,17 +749,17 @@ eoh:
 	 * turns on the dropstatus flag.
 	 */
 	{
-	    char	*cp;
+	    char	*tcp;
 
 	    if (!strncasecmp(line, "Status:", 7))
-		cp = line + 7;
+		tcp = line + 7;
 	    else if (!strncasecmp(line, "X-Mozilla-Status:", 17))
-		cp = line + 17;
+		tcp = line + 17;
 	    else
-		cp = NULL;
-	    if (cp) {
-		while (*cp && isspace((unsigned char)*cp)) cp++;
-		if (!*cp || ctl->dropstatus)
+		tcp = NULL;
+	    if (tcp) {
+		while (*tcp && isspace((unsigned char)*tcp)) tcp++;
+		if (!*tcp || ctl->dropstatus)
 		{
 		    free(line);
 		    continue;
diff --git a/uid.c b/uid.c
index 65f18461..0a7d2ab0 100644
--- a/uid.c
+++ b/uid.c
@@ -282,7 +282,7 @@ void expunge_uids(struct query *ctl)
 	    idl->val.status.mark = UID_EXPUNGED;
 }
 
-const char *str_uidmark(int mark)
+static const char *str_uidmark(int mark)
 {
 	static char buf[20];