diff options
| author | Kevin McCarthy <kevin@8t8.us> | 2020-11-21 14:03:08 -0800 |
|---|---|---|
| committer | Kevin McCarthy <kevin@8t8.us> | 2020-11-21 14:03:08 -0800 |
| commit | 8c967ad54c3d4d6a93233227ee67358d51182828 (patch) | |
| tree | 1609f78a0a4ba8515b82a8bfb7d1c90b0e06dc45 /imap | |
| parent | 3d362fa2d997b46b38dbdf596cf6840e12b6bf33 (diff) | |
Clean up labels in imap_open_connection().
Commit 04b06aaa was purposely kept minimal, to aid backporting the
fix. It kept the err_close_conn label, but there is no need for the
label anymore. Change all goto's to use the bail label.
Diffstat (limited to 'imap')
| -rw-r--r-- | imap/imap.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/imap/imap.c b/imap/imap.c index b13dd54d..a5764891 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -497,7 +497,7 @@ int imap_open_connection (IMAP_DATA* idata) rc = MUTT_YES; else if ((rc = query_quadoption (OPT_SSLSTARTTLS, _("Secure connection with TLS?"))) == -1) - goto err_close_conn; + goto bail; if (rc == MUTT_YES) { if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1) @@ -508,7 +508,7 @@ int imap_open_connection (IMAP_DATA* idata) { mutt_error (_("Could not negotiate TLS connection")); mutt_sleep (1); - goto err_close_conn; + goto bail; } else { @@ -524,7 +524,7 @@ int imap_open_connection (IMAP_DATA* idata) { mutt_error _("Encrypted connection unavailable"); mutt_sleep (1); - goto err_close_conn; + goto bail; } #endif } @@ -542,7 +542,7 @@ int imap_open_connection (IMAP_DATA* idata) { mutt_error _("Encrypted connection unavailable"); mutt_sleep (1); - goto err_close_conn; + goto bail; } #endif @@ -559,9 +559,6 @@ int imap_open_connection (IMAP_DATA* idata) return 0; -#if defined(USE_SSL) -err_close_conn: -#endif bail: imap_close_connection (idata); FREE (&idata->capstr); |