Commit 208fb891 authored by KaoruToda's avatar KaoruToda Committed by Matt Caswell
Browse files

Since return is inconsistent, I removed unnecessary parentheses and 


unified them.
- return (0); -> return 0;
- return (1); -> return 1;
- return (-1); -> return -1;

Reviewed-by: default avatarStephen Henson <steve@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4500)
parent 2e8b5d75

apps/apps.c

+2 −2
Original line number Diff line number Diff line
@@ -109,13 +109,13 @@ int chopup_args(ARGS *arg, char *buf) 
        }

    }

    arg->argv[arg->argc] = NULL;

    return (1);

    return 1;

}



#ifndef APP_INIT

int app_init(long mesgwin)

{

    return (1);

    return 1;

}

#endif

apps/openssl.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[]) 


    BIO_printf(bio_err, "Invalid command '%s'; type \"help\" for a list.\n",

               argv[0]);

    return (1);

    return 1;

}



static void list_pkey(void)

apps/rehash.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ const OPTIONS rehash_options[] = { 
int rehash_main(int argc, char **argv)

{

    BIO_printf(bio_err, "Not available; use c_rehash script\n");

    return (1);

    return 1;

}



#endif /* defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) */

apps/s_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file) 
            return (0);

        }

    }

    return (1);

    return 1;

}



int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,

apps/s_server.c

+1 −1
Original line number Diff line number Diff line
@@ -2760,7 +2760,7 @@ static int init_ssl_connection(SSL *con) 
        if ((dtlslisten && i == 0)

                || (!dtlslisten && retry)) {

            BIO_printf(bio_s_out, "DELAY\n");

            return (1);

            return 1;

        }



        BIO_printf(bio_err, "ERROR\n");