Commit 26a7d938 authored by KaoruToda's avatar KaoruToda Committed by Matt Caswell
Browse files

Remove parentheses of return. 



Since return is inconsistent, I removed unnecessary parentheses and
unified them.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4541)
parent 2139145b

apps/apps.c

+16 −16
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ X509 *load_cert(const char *file, int format, const char *cert_descrip) 
        ERR_print_errors(bio_err);

    }

    BIO_free(cert);

    return (x);

    return x;

}



X509_CRL *load_crl(const char *infile, int format)
@@ -697,7 +697,7 @@ X509_CRL *load_crl(const char *infile, int format) 


 end:

    BIO_free(in);

    return (x);

    return x;

}



EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
@@ -769,7 +769,7 @@ EVP_PKEY *load_key(const char *file, int format, int maybe_stdin, 
        BIO_printf(bio_err, "unable to load %s\n", key_descrip);

        ERR_print_errors(bio_err);

    }

    return (pkey);

    return pkey;

}



EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,
@@ -855,7 +855,7 @@ EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin, 
    BIO_free(key);

    if (pkey == NULL)

        BIO_printf(bio_err, "unable to load %s\n", key_descrip);

    return (pkey);

    return pkey;

}



static int load_certs_crls(const char *file, int format,
@@ -1334,7 +1334,7 @@ static int index_serial_cmp(const OPENSSL_CSTRING *a, 


    for (aa = a[DB_serial]; *aa == '0'; aa++) ;

    for (bb = b[DB_serial]; *bb == '0'; bb++) ;

    return (strcmp(aa, bb));

    return strcmp(aa, bb);

}



static int index_name_qual(char **a)
@@ -1349,7 +1349,7 @@ static unsigned long index_name_hash(const OPENSSL_CSTRING *a) 


int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)

{

    return (strcmp(a[DB_name], b[DB_name]));

    return strcmp(a[DB_name], b[DB_name]);

}



static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING)
@@ -1400,7 +1400,7 @@ BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai) 
 err:

    BIO_free(in);

    ASN1_INTEGER_free(ai);

    return (ret);

    return ret;

}



int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial,
@@ -1450,7 +1450,7 @@ int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial 
 err:

    BIO_free_all(out);

    ASN1_INTEGER_free(ai);

    return (ret);

    return ret;

}



int rotate_serial(const char *serialfile, const char *new_suffix,
@@ -2153,7 +2153,7 @@ double app_tminterval(int stop, int usertime) 
        ret = (__int64)(tmstop.QuadPart - tmstart.QuadPart) * 1e-7;

    }



    return (ret);

    return ret;

}

#elif defined(OPENSSL_SYSTEM_VXWORKS)

# include <time.h>
@@ -2189,7 +2189,7 @@ double app_tminterval(int stop, int usertime) 
    else

        ret = (now - tmstart) / (double)sysClkRateGet();

# endif

    return (ret);

    return ret;

}



#elif defined(OPENSSL_SYSTEM_VMS)
@@ -2223,7 +2223,7 @@ double app_tminterval(int stop, int usertime) 
    else

        ret = (now - tmstart) / (double)(CLK_TCK);



    return (ret);

    return ret;

}



#elif defined(_SC_CLK_TCK)      /* by means of unistd.h */
@@ -2246,7 +2246,7 @@ double app_tminterval(int stop, int usertime) 
        ret = (now - tmstart) / (double)tck;

    }



    return (ret);

    return ret;

}



#else
@@ -2371,9 +2371,9 @@ int raw_read_stdin(void *buf, int siz) 
{

    DWORD n;

    if (ReadFile(GetStdHandle(STD_INPUT_HANDLE), buf, siz, &n, NULL))

        return (n);

        return n;

    else

        return (-1);

        return -1;

}

#elif defined(__VMS)

# include <sys/socket.h>
@@ -2394,9 +2394,9 @@ int raw_write_stdout(const void *buf, int siz) 
{

    DWORD n;

    if (WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, siz, &n, NULL))

        return (n);

        return n;

    else

        return (-1);

        return -1;

}

#else

int raw_write_stdout(const void *buf, int siz)

apps/asn1pars.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int asn1parse_main(int argc, char **argv) 
        OPENSSL_free(str);

    ASN1_TYPE_free(at);

    sk_OPENSSL_STRING_free(osk);

    return (ret);

    return ret;

}



static int do_generate(char *genstr, const char *genconf, BUF_MEM *buf)

apps/ca.c

+8 −8
Original line number Diff line number Diff line
@@ -1235,7 +1235,7 @@ end_of_options: 
    NCONF_free(conf);

    NCONF_free(extconf);

    release_engine(e);

    return (ret);

    return ret;

}



static char *lookup_conf(const CONF *conf, const char *section, const char *tag)
@@ -1312,7 +1312,7 @@ static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509, 
 end:

    X509_REQ_free(req);

    BIO_free(in);

    return (ok);

    return ok;

}



static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
@@ -1365,7 +1365,7 @@ static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x 
 end:

    X509_REQ_free(rreq);

    X509_free(req);

    return (ok);

    return ok;

}



static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
@@ -1866,7 +1866,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, 
        X509_free(ret);

    else

        *xret = ret;

    return (ok);

    return ok;

}



static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
@@ -2013,7 +2013,7 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey, 
    NETSCAPE_SPKI_free(spki);

    X509_NAME_ENTRY_free(ne);



    return (ok);

    return ok;

}



static int check_time_format(const char *str)
@@ -2119,7 +2119,7 @@ static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type, 
 end:

    for (i = 0; i < DB_NUMBER; i++)

        OPENSSL_free(row[i]);

    return (ok);

    return ok;

}



static int get_certificate_status(const char *serial, CA_DB *db)
@@ -2186,7 +2186,7 @@ static int get_certificate_status(const char *serial, CA_DB *db) 
    for (i = 0; i < DB_NUMBER; i++) {

        OPENSSL_free(row[i]);

    }

    return (ok);

    return ok;

}



static int do_updatedb(CA_DB *db)
@@ -2244,7 +2244,7 @@ static int do_updatedb(CA_DB *db) 


    ASN1_UTCTIME_free(a_tm);

    OPENSSL_free(a_tm_s);

    return (cnt);

    return cnt;

}



static const char *crl_reasons[] = {

apps/cms.c

+1 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ int cms_main(int argc, char **argv) 
    BIO_free(indata);

    BIO_free_all(out);

    OPENSSL_free(passin);

    return (ret);

    return ret;

}



static int save_certs(char *signerfile, STACK_OF(X509) *signers)

apps/crl.c

+1 −1
Original line number Diff line number Diff line
@@ -337,5 +337,5 @@ int crl_main(int argc, char **argv) 
    X509_CRL_free(x);

    X509_STORE_CTX_free(ctx);

    X509_STORE_free(store);

    return (ret);

    return ret;

}