email: Post STARTLS capability code tidy up (Part One)

Corrected the order of the CAPA / CAPABILITY state machine constants to
match the execution order.

diff --git a/lib/imap.c b/lib/imap.c
index be0de2eed5e6ae159a6c55aa284d7bec4d4c90c7..5ef2e0f662df4b70fa0fd309b0a8e9a4effa7dca 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -433,9 +433,9 @@ static void state(struct connectdata *conn, imapstate newstate)
   static const char * const names[]={
     "STOP",
     "SERVERGREET",
+    "CAPABILITY",
     "STARTTLS",
     "UPGRADETLS",
-    "CAPABILITY",
     "AUTHENTICATE_PLAIN",
     "AUTHENTICATE_LOGIN",
     "AUTHENTICATE_LOGIN_PASSWD",
@@ -1265,14 +1265,14 @@ static CURLcode imap_statemach_act(struct connectdata *conn)
       result = imap_state_servergreet_resp(conn, imapcode, imapc->state);
       break;
 
-    case IMAP_STARTTLS:
-      result = imap_state_starttls_resp(conn, imapcode, imapc->state);
-      break;
-
     case IMAP_CAPABILITY:
       result = imap_state_capability_resp(conn, imapcode, imapc->state);
       break;
 
+    case IMAP_STARTTLS:
+      result = imap_state_starttls_resp(conn, imapcode, imapc->state);
+      break;
+
     case IMAP_AUTHENTICATE_PLAIN:
       result = imap_state_auth_plain_resp(conn, imapcode, imapc->state);
       break;

diff --git a/lib/imap.h b/lib/imap.h
index a8164c08403811dc552c1fda6f889ee49cd7c101..31888529a3b5721bfd7010b4dc558c98ccb337f1 100644 (file)
--- a/lib/imap.h
+++ b/lib/imap.h
@@ -31,10 +31,10 @@ typedef enum {
   IMAP_STOP,         /* do nothing state, stops the state machine */
   IMAP_SERVERGREET,  /* waiting for the initial greeting immediately after
                         a connect */
+  IMAP_CAPABILITY,
   IMAP_STARTTLS,
   IMAP_UPGRADETLS,   /* asynchronously upgrade the connection to SSL/TLS
                        (multi mode only) */
-  IMAP_CAPABILITY,
   IMAP_AUTHENTICATE_PLAIN,
   IMAP_AUTHENTICATE_LOGIN,
   IMAP_AUTHENTICATE_LOGIN_PASSWD,

diff --git a/lib/pop3.c b/lib/pop3.c
index 2b58df9b558816314b4e4b3f8aa57d8fa1c2db89..3e541fa86405c9a825353b65118246ca2d35dda4 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -345,9 +345,9 @@ static void state(struct connectdata *conn, pop3state newstate)
   static const char * const names[] = {
     "STOP",
     "SERVERGREET",
+    "CAPA",
     "STARTTLS",
     "UPGRADETLS",
-    "CAPA",
     "AUTH_PLAIN",
     "AUTH_LOGIN",
     "AUTH_LOGIN_PASSWD",
@@ -1185,14 +1185,14 @@ static CURLcode pop3_statemach_act(struct connectdata *conn)
       result = pop3_state_servergreet_resp(conn, pop3code, pop3c->state);
       break;
 
-    case POP3_STARTTLS:
-      result = pop3_state_starttls_resp(conn, pop3code, pop3c->state);
-      break;
-
     case POP3_CAPA:
       result = pop3_state_capa_resp(conn, pop3code, pop3c->state);
       break;
 
+    case POP3_STARTTLS:
+      result = pop3_state_starttls_resp(conn, pop3code, pop3c->state);
+      break;
+
     case POP3_AUTH_PLAIN:
       result = pop3_state_auth_plain_resp(conn, pop3code, pop3c->state);
       break;

diff --git a/lib/pop3.h b/lib/pop3.h
index c37b009ddff6c016993a8693f8c2fbc6b5e0d5cb..6ef408e4982ed6d849b1261288f43b01a724f2bc 100644 (file)
--- a/lib/pop3.h
+++ b/lib/pop3.h
@@ -29,10 +29,10 @@ typedef enum {
   POP3_STOP,         /* do nothing state, stops the state machine */
   POP3_SERVERGREET,  /* waiting for the initial greeting immediately after
                         a connect */
+  POP3_CAPA,
   POP3_STARTTLS,
   POP3_UPGRADETLS,   /* asynchronously upgrade the connection to SSL/TLS
                        (multi mode only) */
-  POP3_CAPA,
   POP3_AUTH_PLAIN,
   POP3_AUTH_LOGIN,
   POP3_AUTH_LOGIN_PASSWD,