aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/imap.c4
-rw-r--r--lib/pop3.c2
-rw-r--r--lib/smtp.c4
3 files changed, 2 insertions, 8 deletions
diff --git a/lib/imap.c b/lib/imap.c
index 469dad32d..288d1994f 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -629,7 +629,7 @@ static CURLcode imap_state_starttls_resp(struct connectdata *conn,
}
else {
state(conn, IMAP_UPGRADETLS);
- return imap_state_upgrade_tls(conn);
+ result = imap_state_upgrade_tls(conn);
}
return result;
@@ -1628,8 +1628,6 @@ static CURLcode imap_regular_transfer(struct connectdata *conn,
return CURLE_OK;
result = imap_dophase_done(conn, connected);
- if(result)
- return result;
}
return result;
diff --git a/lib/pop3.c b/lib/pop3.c
index cb86911dd..eabcd3004 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1608,8 +1608,6 @@ static CURLcode pop3_regular_transfer(struct connectdata *conn,
return CURLE_OK;
result = pop3_dophase_done(conn, connected);
- if(result)
- return result;
}
return result;
diff --git a/lib/smtp.c b/lib/smtp.c
index af3fb0680..05c0a780a 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -492,7 +492,7 @@ static CURLcode smtp_state_starttls_resp(struct connectdata *conn,
}
else {
state(conn, SMTP_UPGRADETLS);
- return smtp_state_upgrade_tls(conn);
+ result = smtp_state_upgrade_tls(conn);
}
return result;
@@ -1599,8 +1599,6 @@ static CURLcode smtp_regular_transfer(struct connectdata *conn,
return CURLE_OK;
result = smtp_dophase_done(conn, connected);
- if(result)
- return result;
}
return result;