Rename a methods and some variables to steer clear of C++ namespace.

svn path=/branches/BRANCH_6-3/; revision=4733

5 files changed, 43 insertions, 43 deletions

diff --git a/driver.c b/driver.c
index c5b92ad2..08d320a9 100644
--- a/driver.c
+++ b/driver.c
@@ -774,7 +774,7 @@ flagthemail:
 	    if (outlevel > O_SILENT) 
 		report(stdout, GT_(" retained\n"));
 	}
-	else if (ctl->server.base_protocol->delete
+	else if (ctl->server.base_protocol->delete_msg
 		 && !suppress_delete
 		 && ((msgcode >= 0 && !ctl->keep)
 		     || (msgcode == MSGLEN_OLD && ctl->flush)
@@ -783,7 +783,7 @@ flagthemail:
 	    (*deletions)++;
 	    if (outlevel > O_SILENT) 
 		report_complete(stdout, GT_(" flushed\n"));
-	    err = (ctl->server.base_protocol->delete)(mailserver_socket, ctl, num);
+	    err = (ctl->server.base_protocol->delete_msg)(mailserver_socket, ctl, num);
 	    if (err != 0)
 		return(err);
 	}
@@ -940,7 +940,7 @@ static int do_session(
     {
 	/* setjmp returned zero -> normal operation */
 	char buf[MSGBUFSIZE+1], *realhost;
-	int count, new, bytes;
+	int count, newm, bytes;
 	int fetches, dispatches, oldphase;
 	struct idlist *idp;
 
@@ -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, (const char *)idp->id, &count, &new, &bytes);
+		err = (ctl->server.base_protocol->getrange)(mailserver_socket, ctl, (const char *)idp->id, &count, &newm, &bytes);
 		if (err != 0)
 		    goto cleanUp;
 
@@ -1322,11 +1322,11 @@ is restored."));
 			report(stdout, GT_("Polling %s\n"), ctl->server.truename);
 		    else if (count != 0)
 		    {
-			if (new != -1 && (count - new) > 0)
+			if (newm != -1 && (count - newm) > 0)
 			    report_build(stdout, ngettext("%d message (%d %s) for %s", "%d messages (%d %s) for %s", (unsigned long)count),
 				  count,
-				  count-new, 
-				  ngettext("seen", "seen", (unsigned long)count-new),
+				  count - newm, 
+				  ngettext("seen", "seen", (unsigned long)count-newm),
 				  buf);
 			else
 			    report_build(stdout, ngettext("%d message for %s",
@@ -1352,9 +1352,9 @@ is restored."));
 
 		if (check_only)
 		{
-		    if (new == -1 || ctl->fetchall)
-			new = count;
-		    fetches = new;	/* set error status correctly */
+		    if (newm == -1 || ctl->fetchall)
+			newm = count;
+		    fetches = newm;	/* set error status correctly */
 		    /*
 		     * There used to be a `goto noerror' here, but this
 		     * prevented checking of multiple folders.  This
diff --git a/fetchmail.h b/fetchmail.h
index 4066facd..d450afc1 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -218,7 +218,7 @@ struct method		/* describe methods for protocol state machine */
 				/* fetch a given message */
     int (*trail)(int, struct query *, int, const char *);
 				/* eat trailer of a message */
-    int (*delete)(int, struct query *, int);
+    int (*delete_msg)(int, struct query *, int);
 				/* delete method */
     int (*mark_seen)(int, struct query *, int);
 				/* mark as seen method */
diff --git a/pop3.c b/pop3.c
index 291327ac..0570a3cc 100644
--- a/pop3.c
+++ b/pop3.c
@@ -723,20 +723,20 @@ static int pop3_fastuidl( int sock,  struct query *ctl, unsigned int count, int
     last_nr = count + 1;
     while (first_nr < last_nr - 1)
     {
-	struct idlist	*new;
+	struct idlist	*newl;
 
 	try_nr = (first_nr + last_nr) / 2;
 	if ((ok = pop3_getuidl(sock, try_nr, id, sizeof(id))) != 0)
 	    return ok;
-	if ((new = str_in_list(&ctl->oldsaved, id, FALSE)))
+	if ((newl = str_in_list(&ctl->oldsaved, id, FALSE)))
 	{
-	    flag mark = new->val.status.mark;
+	    flag mark = newl->val.status.mark;
 	    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);
 		/* just mark it as seen now! */
-		new->val.status.mark = mark = UID_SEEN;
+		newl->val.status.mark = mark = UID_SEEN;
 	    }
 
 	    /* narrow the search region! */
@@ -750,7 +750,7 @@ static int pop3_fastuidl( int sock,  struct query *ctl, unsigned int count, int
 		first_nr = try_nr;
 
 	    /* save the number */
-	    new->val.status.num = try_nr;
+	    newl->val.status.num = try_nr;
 	}
 	else
 	{
@@ -759,8 +759,8 @@ static int pop3_fastuidl( int sock,  struct query *ctl, unsigned int count, int
 	    last_nr = try_nr;
 
 	    /* save it */
-	    new = save_str(&ctl->oldsaved, id, UID_UNSEEN);
-	    new->val.status.num = try_nr;
+	    newl = save_str(&ctl->oldsaved, id, UID_UNSEEN);
+	    newl->val.status.num = try_nr;
 	}
     }
     if (outlevel >= O_DEBUG && last_nr <= count)
@@ -844,10 +844,10 @@ static int pop3_slowuidl( int sock,  struct query *ctl, int *countp, int *newp)
     /* the first try_id messages are known -> copy them to the newsaved list */
     for( num = first_nr; num < list_len; num++ )
     {
-	struct idlist	*new = save_str(&ctl->newsaved, 
+	struct idlist	*newl = save_str(&ctl->newsaved, 
 				str_from_nr_list(&ctl->oldsaved, num),
 				UID_UNSEEN);
-	new->val.status.num = num - first_nr + 1;
+	newl->val.status.num = num - first_nr + 1;
     }
 
     if( nolinear ) {
@@ -960,10 +960,10 @@ static int pop3_getrange(int sock,
 
 		    if (parseuid(buf, &unum, id, sizeof(id)) == PS_SUCCESS)
 		    {
-			struct idlist	*old, *new;
+			struct idlist	*old, *newl;
 
-			new = save_str(&ctl->newsaved, id, UID_UNSEEN);
-			new->val.status.num = unum;
+			newl = save_str(&ctl->newsaved, id, UID_UNSEEN);
+			newl->val.status.num = unum;
 
 			if ((old = str_in_list(&ctl->oldsaved, id, FALSE)))
 			{
@@ -979,7 +979,7 @@ static int pop3_getrange(int sock,
 				/* just mark it as seen now! */
 				old->val.status.mark = mark = UID_SEEN;
 			    }
-			    new->val.status.mark = mark;
+			    newl->val.status.mark = mark;
 			    if (mark == UID_UNSEEN)
 			    {
 				(*newp)++;
@@ -1067,7 +1067,7 @@ static int pop3_getsizes(int sock, int count, int *sizes)
 static int pop3_is_old(int sock, struct query *ctl, int num)
 /* is the given message old? */
 {
-    struct idlist *new;
+    struct idlist *newl;
     if (!ctl->oldsaved)
 	return (num <= last);
     else if (dofastuidl)
@@ -1079,30 +1079,30 @@ static int pop3_is_old(int sock, struct query *ctl, int num)
 
 	/* in fast uidl, we manipulate the old list only! */
 
-	if ((new = id_find(&ctl->oldsaved, num)))
+	if ((newl = id_find(&ctl->oldsaved, num)))
 	{
 	    /* we already have the id! */
-	    return(new->val.status.mark != UID_UNSEEN);
+	    return(newl->val.status.mark != UID_UNSEEN);
 	}
 
 	/* get the uidl first! */
 	if (pop3_getuidl(sock, num, id, sizeof(id)) != PS_SUCCESS)
 	    return(TRUE);
 
-	if ((new = str_in_list(&ctl->oldsaved, id, FALSE))) {
+	if ((newl = str_in_list(&ctl->oldsaved, id, FALSE))) {
 	    /* we already have the id! */
-	    new->val.status.num = num;
-	    return(new->val.status.mark != UID_UNSEEN);
+	    newl->val.status.num = num;
+	    return(newl->val.status.mark != UID_UNSEEN);
 	}
 
 	/* save it */
-	new = save_str(&ctl->oldsaved, id, UID_UNSEEN);
-	new->val.status.num = num;
+	newl = save_str(&ctl->oldsaved, id, UID_UNSEEN);
+	newl->val.status.num = num;
 	return(FALSE);
     }
     else
-        return ((new = id_find(&ctl->newsaved, num)) != NULL &&
-	    new->val.status.mark != UID_UNSEEN);
+        return ((newl = id_find(&ctl->newsaved, num)) != NULL &&
+	    newl->val.status.mark != UID_UNSEEN);
 }
 
 #ifdef UNUSED
diff --git a/rpa.c b/rpa.c
index cb61b3f2..e52a889e 100644
--- a/rpa.c
+++ b/rpa.c
@@ -518,7 +518,7 @@ int rxlen;
 static int DecBase64(bufp)
 unsigned char *bufp;
 {
-    unsigned int   new, bits=0, cnt=0, i, part=0;
+    unsigned int   newx, bits=0, cnt=0, i, part=0;
     unsigned char  ch;
     unsigned char* outp=bufp;
     unsigned char* inp=bufp;
@@ -526,16 +526,16 @@ unsigned char *bufp;
     {
 	if ((ch != '=') && (ch != ' ') && (ch != '\n') && (ch != '\r'))
 	{
-	    if      ((ch>='A') && (ch <= 'Z'))   new = ch - 'A';
-	    else if ((ch>='a') && (ch <= 'z'))   new = ch - 'a' + 26;
-	    else if ((ch>='0') && (ch <= '9'))   new = ch - '0' + 52;
-	    else if ( ch=='+'                )   new = 62;
-	    else if ( ch=='/'                )   new = 63;
+	    if      ((ch>='A') && (ch <= 'Z'))   newx = ch - 'A';
+	    else if ((ch>='a') && (ch <= 'z'))   newx = ch - 'a' + 26;
+	    else if ((ch>='0') && (ch <= '9'))   newx = ch - '0' + 52;
+	    else if ( ch=='+'                )   newx = 62;
+	    else if ( ch=='/'                )   newx = 63;
 	    else {
 		report(stderr,  GT_("dec64 error at char %d: %x\n"), inp - bufp, ch);
 		return(0);
 	    }
-	    part=((part & 0x3F)*64) + new;
+	    part=((part & 0x3F)*64) + newx;
 	    bits += 6;
 	    if (bits >= 8)
 	    {
diff --git a/transact.c b/transact.c
index 1d5d1990..73ec9d31 100644
--- a/transact.c
+++ b/transact.c
@@ -856,8 +856,8 @@ int readheaders(int sock,
  		sscanf(line+12, "%s", id);
  	        if (!str_find( &ctl->newsaved, num))
 		{
- 		    struct idlist *new = save_str(&ctl->newsaved,id,UID_SEEN);
-		    new->val.status.num = num;
+ 		    struct idlist *newl = save_str(&ctl->newsaved,id,UID_SEEN);
+		    newl->val.status.num = num;
 		}
  	    }
  	}