aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2012-06-09 19:21:44 +0100
committerSteve Holme <steve_holme@hotmail.com>2012-06-09 19:21:44 +0100
commita3660127a4497b2e30988c5f6aad3d17343ed6e0 (patch)
tree93117d95368400197bedbed1a9d0c6ec71c6ec0b
parentc09c621af7ad0bb81a5ab96ed0e0ce4e99ae3119 (diff)
pop3: Post apop feature code tidy up
-rw-r--r--lib/pop3.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/pop3.c b/lib/pop3.c
index 8ce7f259b..844c463f1 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1356,7 +1356,7 @@ static CURLcode pop3_done(struct connectdata *conn, CURLcode status,
result = status; /* use the already set error code */
}
- /* Clear our variables for the next connection */
+ /* Cleanup our do based variables */
Curl_safefree(pop3c->mailbox);
Curl_safefree(pop3c->custom);
@@ -1494,14 +1494,15 @@ static CURLcode pop3_disconnect(struct connectdata *conn,
if(!dead_connection && pop3c->pp.conn)
(void)pop3_quit(conn); /* ignore errors on the LOGOUT */
+ /* Disconnect from the server */
Curl_pp_disconnect(&pop3c->pp);
- /* Clear our variables */
- Curl_safefree(pop3c->apoptimestamp);
-
/* Cleanup the SASL module */
Curl_sasl_cleanup(conn, pop3c->authused);
+ /* Cleanup our connection based variables */
+ Curl_safefree(pop3c->apoptimestamp);
+
return CURLE_OK;
}