Commit cbe29648 authored by Rich Salz's avatar Rich Salz
Browse files

Consistent formatting for sizeof(foo) 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4872)
parent e7a20669

apps/apps.c

+24 −24
Original line number Diff line number Diff line
@@ -1425,9 +1425,9 @@ int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial 
        OPENSSL_strlcpy(buf[0], serialfile, BSIZE);

    else {

#ifndef OPENSSL_SYS_VMS

        j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", serialfile, suffix);

        j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, suffix);

#else

        j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, suffix);

        j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, suffix);

#endif

    }

    out = BIO_new_file(buf[0], "w");
@@ -1468,11 +1468,11 @@ int rotate_serial(const char *serialfile, const char *new_suffix, 
        goto err;

    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s", serialfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", serialfile, old_suffix);

#else

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", serialfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", serialfile, old_suffix);

#endif

    if (rename(serialfile, buf[1]) < 0 && errno != ENOENT

#ifdef ENOTDIR
@@ -1537,9 +1537,9 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr) 
        goto err;



#ifndef OPENSSL_SYS_VMS

    BIO_snprintf(buf, sizeof buf, "%s.attr", dbfile);

    BIO_snprintf(buf, sizeof(buf), "%s.attr", dbfile);

#else

    BIO_snprintf(buf, sizeof buf, "%s-attr", dbfile);

    BIO_snprintf(buf, sizeof(buf), "%s-attr", dbfile);

#endif

    dbattr_conf = app_load_config(buf);
@@ -1600,13 +1600,13 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db) 
        goto err;

    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s.attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.attr.%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, suffix);

    j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.attr.%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, suffix);

#else

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-attr-%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, suffix);

    j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-attr-%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, suffix);

#endif

    out = BIO_new_file(buf[0], "w");

    if (out == NULL) {
@@ -1649,17 +1649,17 @@ int rotate_index(const char *dbfile, const char *new_suffix, 
        goto err;

    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[4], sizeof buf[4], "%s.attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof buf[3], "%s.attr.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s.attr.%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[4], sizeof(buf[4]), "%s.attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof(buf[3]), "%s.attr.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr.%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, new_suffix);

#else

    j = BIO_snprintf(buf[4], sizeof buf[4], "%s-attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof buf[3], "%s-attr-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr-%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[4], sizeof(buf[4]), "%s-attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof(buf[3]), "%s-attr-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr-%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, new_suffix);

#endif

    if (rename(dbfile, buf[1]) < 0 && errno != ENOENT

#ifdef ENOTDIR

apps/ciphers.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ int ciphers_main(int argc, char **argv) 
                    nm = "UNKNOWN";

                BIO_printf(bio_out, "%s - ", nm);

            }

            BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof buf));

            BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof(buf)));

        }

    }

apps/enc.c

+9 −9
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int enc_main(int argc, char **argv) 
    char *hkey = NULL, *hiv = NULL, *hsalt = NULL, *p;

    char *infile = NULL, *outfile = NULL, *prog;

    char *str = NULL, *passarg = NULL, *pass = NULL, *strbuf = NULL;

    char mbuf[sizeof magic - 1];

    char mbuf[sizeof(magic) - 1];

    OPTION_CHOICE o;

    int bsize = BSIZE, verbose = 0, debug = 0, olb64 = 0, nosalt = 0;

    int enc = 1, printkey = 0, i, k;
@@ -220,7 +220,7 @@ int enc_main(int argc, char **argv) 
            in = bio_open_default(opt_arg(), 'r', FORMAT_TEXT);

            if (in == NULL)

                goto opthelp;

            i = BIO_gets(in, buf, sizeof buf);

            i = BIO_gets(in, buf, sizeof(buf));

            BIO_free(in);

            in = NULL;

            if (i <= 0) {
@@ -409,11 +409,11 @@ int enc_main(int argc, char **argv) 
            } else {

                if (enc) {

                    if (hsalt) {

                        if (!set_hex(hsalt, salt, sizeof salt)) {

                        if (!set_hex(hsalt, salt, sizeof(salt))) {

                            BIO_printf(bio_err, "invalid hex salt value\n");

                            goto end;

                        }

                    } else if (RAND_bytes(salt, sizeof salt) <= 0) {

                    } else if (RAND_bytes(salt, sizeof(salt)) <= 0) {

                        goto end;

                    }

                    /*
@@ -421,20 +421,20 @@ int enc_main(int argc, char **argv) 
                     */

                    if ((printkey != 2)

                        && (BIO_write(wbio, magic,

                                      sizeof magic - 1) != sizeof magic - 1

                                      sizeof(magic) - 1) != sizeof(magic) - 1

                            || BIO_write(wbio,

                                         (char *)salt,

                                         sizeof salt) != sizeof salt)) {

                                         sizeof(salt)) != sizeof(salt))) {

                        BIO_printf(bio_err, "error writing output file\n");

                        goto end;

                    }

                } else if (BIO_read(rbio, mbuf, sizeof mbuf) != sizeof mbuf

                } else if (BIO_read(rbio, mbuf, sizeof(mbuf)) != sizeof(mbuf)

                           || BIO_read(rbio,

                                       (unsigned char *)salt,

                                       sizeof salt) != sizeof salt) {

                                       sizeof(salt)) != sizeof(salt)) {

                    BIO_printf(bio_err, "error reading input file\n");

                    goto end;

                } else if (memcmp(mbuf, magic, sizeof magic - 1)) {

                } else if (memcmp(mbuf, magic, sizeof(magic) - 1)) {

                    BIO_printf(bio_err, "bad magic number\n");

                    goto end;

                }

apps/errstr.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int errstr_main(int argc, char **argv) 
             */

            OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS

                             | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);

            ERR_error_string_n(l, buf, sizeof buf);

            ERR_error_string_n(l, buf, sizeof(buf));

            BIO_printf(bio_out, "%s\n", buf);

        }

    }

apps/ocsp.c

+2 −2
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio) 
    *pcbio = cbio;



    /* Read the request line. */

    len = BIO_gets(cbio, reqbuf, sizeof reqbuf);

    len = BIO_gets(cbio, reqbuf, sizeof(reqbuf));

    if (len <= 0)

        return 1;

    if (strncmp(reqbuf, "GET ", 4) == 0) {
@@ -1130,7 +1130,7 @@ static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio) 


    /* Read and skip past the headers. */

    for (;;) {

        len = BIO_gets(cbio, inbuf, sizeof inbuf);

        len = BIO_gets(cbio, inbuf, sizeof(inbuf));

        if (len <= 0)

            return 1;

        if ((inbuf[0] == '\r') || (inbuf[0] == '\n'))