Don't `else' after return. Simplify control flow.

[nmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 83b6ec9695b2d3b64ea6e166063c1a45f10a7f3c..aadfe98b05f4cedb64e5536b0ef5dc0a06f338bf 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -413,25 +413,21 @@ main (int argc, char **argv)
      * a POP server?
      */
     if (inc_type == INC_POP) {
-       struct nmh_creds creds = { 0, 0, 0 };
-
        if (auth_svc == NULL) {
            if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
                adios (NULL, "must specify -authservice with -saslmech xoauth2");
            }
-           nmh_get_credentials (host, user, sasl, &creds);
        } else {
            if (user == NULL) {
                adios (NULL, "must specify -user with -saslmech xoauth2");
            }
-           creds.user = user;
        }
 
        /*
         * initialize POP connection
         */
-       if (pop_init (host, port, creds.user, creds.password, proxy, snoop,
-                     sasl, saslmech, tls, auth_svc) == NOTOK)
+       if (pop_init (host, port, user, proxy, snoop, sasl, saslmech,
+                     tls, auth_svc) == NOTOK)
            adios (NULL, "%s", response);
 
        /* Check if there are any messages */