Reverse order of arguments in OK method.

svn path=/trunk/; revision=201

4 files changed, 19 insertions, 19 deletions

diff --git a/driver.c b/driver.c
index c5ee171d..8f9a8f04 100644
--- a/driver.c
+++ b/driver.c
@@ -523,7 +523,7 @@ struct method *proto;
     }
 
     /* accept greeting message from mail server */
-    ok = (protocol->parse_response)(buf, socket);
+    ok = (protocol->parse_response)(socket, buf);
     if (ok != 0)
 	goto cleanUp;
 
@@ -535,7 +535,7 @@ struct method *proto;
 	goto cleanUp;
 
     /* compute count, and get UID list if possible */
-    if ((*protocol->getrange)(socket, queryctl, &count) != 0)
+    if ((protocol->getrange)(socket, queryctl, &count) != 0)
 	goto cleanUp;
 
     /* show user how many messages we downloaded */
@@ -572,14 +572,14 @@ struct method *proto;
 	for (num = 1; num <= count; num++)
 	{
 	    int	treat_as_new = 
-		!*protocol->is_old 
-		|| !(*protocol->is_old)(socket, queryctl, num);
+		!protocol->is_old 
+		|| !(protocol->is_old)(socket, queryctl, num);
 
 	    /* we may want to reject this message if it's old */
 	    if (treat_as_new || queryctl->fetchall)
 	    {
 		/* request a message */
-		(*protocol->fetch)(socket, num, &len);
+		(protocol->fetch)(socket, num, &len);
 		if (outlevel == O_VERBOSE)
 		    if (protocol->delimited)
 			fprintf(stderr,
@@ -601,7 +601,7 @@ struct method *proto;
 
 		/* tell the server we got it OK and resynchronize */
 		if (protocol->trail)
-		    (*protocol->trail)(socket, queryctl, num);
+		    (protocol->trail)(socket, queryctl, num);
 		if (ok != 0)
 		    goto cleanUp;
 	    }
@@ -742,7 +742,7 @@ va_dcl {
     fprintf(stderr,"> %s\n", buf);
 
   /* we presume this does its own response echoing */
-  ok = (protocol->parse_response)(buf,socket);
+  ok = (protocol->parse_response)(socket, buf);
 
   return(ok);
 }
diff --git a/imap.c b/imap.c
index d4d23401..07ef852b 100644
--- a/imap.c
+++ b/imap.c
@@ -25,7 +25,7 @@
 
 static int count, seen;
 
-int imap_ok (argbuf,socket)
+int imap_ok (socket, argbuf)
 /* parse command response */
 char *argbuf;
 int socket;
diff --git a/pop2.c b/pop2.c
index 351aaa04..09378ce5 100644
--- a/pop2.c
+++ b/pop2.c
@@ -18,10 +18,10 @@
 
 static int pound_arg, equal_arg;
 
-int pop2_ok (argbuf,socket)
+int pop2_ok (socket, argbuf)
 /* parse POP2 command response */
-char *argbuf;
 int socket;
+char *argbuf;
 {
     int ok;
     char buf [POPBUFSIZE+1];
diff --git a/pop3.c b/pop3.c
index 084ebc15..3956c842 100644
--- a/pop3.c
+++ b/pop3.c
@@ -19,10 +19,10 @@
 
 static int last;
 
-int pop3_ok (argbuf,socket)
+int pop3_ok (socket, argbuf)
 /* parse command response */
-char *argbuf;
 int socket;
+char *argbuf;
 {
   int ok;
   char buf [POPBUFSIZE+1];
@@ -101,27 +101,27 @@ char *greeting;
     switch (queryctl->protocol) {
     case P_POP3:
 	gen_send(socket,"USER %s", queryctl->remotename);
-	if (pop3_ok(buf,socket) != 0)
+	if (pop3_ok(socket, buf) != 0)
 	    goto badAuth;
 
 	gen_send(socket, "PASS %s", queryctl->password);
-	if (pop3_ok(buf,socket) != 0)
+	if (pop3_ok(socket, buf) != 0)
 	    goto badAuth;
 	break;
 
     case P_RPOP:
 	gen_send(socket,"USER %s", queryctl->remotename);
-	if (pop3_ok(buf,socket) != 0)
+	if (pop3_ok(socket, buf) != 0)
 	    goto badAuth;
 
 	gen_send(socket, "RPOP %s", queryctl->password);
-	if (pop3_ok(buf,socket) != 0)
+	if (pop3_ok(socket, buf) != 0)
 	    goto badAuth;
 	break;
 
     case P_APOP:
 	gen_send(socket,"APOP %s %s", queryctl->remotename, queryctl->digest);
-	if (pop3_ok(buf,socket) != 0) 
+	if (pop3_ok(socket, buf) != 0) 
 	    goto badAuth;
 	break;
 
@@ -151,7 +151,7 @@ int *countp;
 
     /* get the total message count */
     gen_send(socket, "STAT");
-    ok = pop3_ok(buf,socket);
+    ok = pop3_ok(socket, buf);
     if (ok == 0)
 	sscanf(buf,"%d %*d", countp);
     else
@@ -166,7 +166,7 @@ int *countp;
 	char id [IDLEN+1];
 
 	gen_send(socket,"LAST");
-	ok = pop3_ok(buf,socket);
+	ok = pop3_ok(socket, buf);
 	if (ok == 0 && sscanf(buf, "%d", &last) == 0)
 	    return(PS_ERROR);
     }