diff options
author | ng0 <ng0@n0.is> | 2019-08-15 09:52:39 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-08-15 09:52:39 +0000 |
commit | 36fb08f81b748620e97d7d8e2d4255b77e78c545 (patch) | |
tree | 19aa5019c9e9cbf53d74e272fddc8cbc48b39e51 /lib/pop3.c | |
parent | 765f80c1e27acb585eebef46a97ffc769e452879 (diff) | |
parent | aa73eb47bc8583070734696b25b34ad54c2c1f5e (diff) | |
download | gnurl-36fb08f81b748620e97d7d8e2d4255b77e78c545.tar.gz gnurl-36fb08f81b748620e97d7d8e2d4255b77e78c545.tar.bz2 gnurl-36fb08f81b748620e97d7d8e2d4255b77e78c545.zip |
Merge tag 'curl-7_65_3'
7.65.3
Diffstat (limited to 'lib/pop3.c')
-rw-r--r-- | lib/pop3.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/pop3.c b/lib/pop3.c index ad3087e58..e06cda1ca 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -339,10 +339,8 @@ static CURLcode pop3_perform_capa(struct connectdata *conn) */ static CURLcode pop3_perform_starttls(struct connectdata *conn) { - CURLcode result = CURLE_OK; - /* Send the STLS command */ - result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", "STLS"); + CURLcode result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", "STLS"); if(!result) state(conn, POP3_STARTTLS); @@ -358,11 +356,10 @@ static CURLcode pop3_perform_starttls(struct connectdata *conn) */ static CURLcode pop3_perform_upgrade_tls(struct connectdata *conn) { - CURLcode result = CURLE_OK; - struct pop3_conn *pop3c = &conn->proto.pop3c; - /* Start the SSL connection */ - result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &pop3c->ssldone); + struct pop3_conn *pop3c = &conn->proto.pop3c; + CURLcode result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, + &pop3c->ssldone); if(!result) { if(pop3c->state != POP3_UPGRADETLS) @@ -593,10 +590,8 @@ static CURLcode pop3_perform_command(struct connectdata *conn) */ static CURLcode pop3_perform_quit(struct connectdata *conn) { - CURLcode result = CURLE_OK; - /* Send the QUIT command */ - result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", "QUIT"); + CURLcode result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", "QUIT"); if(!result) state(conn, POP3_QUIT); |