tcpconnect: follow-up commit after b998d95b

As I modified conn->bits.tcpconnect to become an array that holds one
bool for each potential connection all uses of that struct field must
index it correctly.

diff --git a/lib/imap.c b/lib/imap.c
index f414ee7bbf3c5e2cf6054ac36538fa70edf5d709..f6d4362c6b4b0a14feb63909bc5674d48b73f567 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -841,7 +841,7 @@ CURLcode imap_perform(struct connectdata *conn,
     result = imap_easy_statemach(conn);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done)
     DEBUGF(infof(conn->data, "DO phase is complete\n"));

diff --git a/lib/pop3.c b/lib/pop3.c
index 30766711c71c6971fad510fdb67df17d31def5bb..42f6c1dbf22c9ffcd8f0c7035af0171f035c2682 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -787,7 +787,7 @@ CURLcode pop3_perform(struct connectdata *conn,
     result = pop3_easy_statemach(conn);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done)
     DEBUGF(infof(conn->data, "DO phase is complete\n"));

diff --git a/lib/smtp.c b/lib/smtp.c
index aab4f80b4de53ce8ddbba1c3cd939b931ecfc0a0..5fa98934655e8784f4ccfdd6eed55d03b686f197 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1287,7 +1287,7 @@ CURLcode smtp_perform(struct connectdata *conn,
     result = smtp_easy_statemach(conn);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done)
     DEBUGF(infof(conn->data, "DO phase is complete\n"));

diff --git a/lib/ssh.c b/lib/ssh.c
index c46511d5de9e8538217e87b38c7af84084a90e37..acfeb9fa134db37cc8c8ee619faf108e7b9b6a2a 100644 (file)
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2701,7 +2701,7 @@ CURLcode scp_perform(struct connectdata *conn,
     result = ssh_easy_statemach(conn, FALSE);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done) {
     DEBUGF(infof(conn->data, "DO phase is complete\n"));
@@ -2908,7 +2908,7 @@ CURLcode sftp_perform(struct connectdata *conn,
     result = ssh_easy_statemach(conn, FALSE);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done) {
     DEBUGF(infof(conn->data, "DO phase is complete\n"));