commit afad1ce753a108d64747e5d03168ace4b65aa751
author Steve Holme <steve_holme@hotmail.com> Wed Feb 27 21:20:11 2013 +0000
committer Steve Holme <steve_holme@hotmail.com> Wed Feb 27 21:20:11 2013 +0000
tree 93390c7d22b39a597b979ee75b3d1d1d2f244a98
parent 13006f3de9ec017ff27b50b82f9cf02abdcf22e5

pop3: Re-factored the final POP3_AUTH constant

Changed the final POP3_AUTH constant to POP3_AUTH_FINAL for consistency
with the response function.

lib/pop3.c

diff --git a/lib/pop3.c b/lib/pop3.c
index ffccfe0..0d46372 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -676,7 +676,7 @@
         result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", plainauth);
 
         if(!result)
-          state(conn, POP3_AUTH);
+          state(conn, POP3_AUTH_FINAL);
       }
 
       Curl_safefree(plainauth);
@@ -750,7 +750,7 @@
         result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", authpasswd);
 
         if(!result)
-          state(conn, POP3_AUTH);
+          state(conn, POP3_AUTH_FINAL);
       }
 
       Curl_safefree(authpasswd);
@@ -805,7 +805,7 @@
       result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", rplyb64);
 
       if(!result)
-        state(conn, POP3_AUTH);
+        state(conn, POP3_AUTH_FINAL);
     }
 
     Curl_safefree(rplyb64);
@@ -875,7 +875,7 @@
     result = Curl_pp_sendf(&conn->proto.pop3c.pp, "");
 
     if(!result)
-      state(conn, POP3_AUTH);
+      state(conn, POP3_AUTH_FINAL);
   }
 
   return result;
@@ -951,7 +951,7 @@
         result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", type3msg);
 
         if(!result)
-          state(conn, POP3_AUTH);
+          state(conn, POP3_AUTH_FINAL);
       }
 
       Curl_safefree(type3msg);
@@ -1215,7 +1215,7 @@
       break;
 #endif
 
-    case POP3_AUTH:
+    case POP3_AUTH_FINAL:
       result = pop3_state_auth_final_resp(conn, pop3code, pop3c->state);
       break;
 

lib/pop3.h

diff --git a/lib/pop3.h b/lib/pop3.h
index 335e67d..129dffc 100644
--- a/lib/pop3.h
+++ b/lib/pop3.h
@@ -43,7 +43,7 @@
   POP3_AUTH_DIGESTMD5_RESP,
   POP3_AUTH_NTLM,
   POP3_AUTH_NTLM_TYPE2MSG,
-  POP3_AUTH,
+  POP3_AUTH_FINAL,
   POP3_APOP,
   POP3_USER,
   POP3_PASS,