diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-15 13:56:44 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-21 10:51:57 +0100 |
| commit | d278284e74cb0864a1cb33256ecac0c1c4f0a55b (patch) | |
| tree | a1fbb7f1431b48550162a688391354c22ac6574d | |
| parent | a043d0b91d62fd8526a3fd791e3ad2ebcf888cd9 (diff) | |
| download | openssl-d278284e74cb0864a1cb33256ecac0c1c4f0a55b.tar.gz | |
Fix some code maintenance issues
Various instances of variables being written to, but then never read.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | apps/enc.c | 1 | ||||
| -rw-r--r-- | apps/errstr.c | 1 | ||||
| -rw-r--r-- | apps/openssl.c | 1 | ||||
| -rw-r--r-- | apps/ts.c | 1 | ||||
| -rw-r--r-- | apps/x509.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/asn_mime.c | 2 |
6 files changed, 2 insertions, 6 deletions
diff --git a/apps/enc.c b/apps/enc.c index 9e7d069264..1bdbf608c0 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -292,7 +292,6 @@ int enc_main(int argc, char **argv) } } argc = opt_num_rest(); - argv = opt_rest(); if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) { BIO_printf(bio_err, "%s: AEAD ciphers not supported\n", prog); diff --git a/apps/errstr.c b/apps/errstr.c index 141338adac..cd7f6c5e76 100644 --- a/apps/errstr.c +++ b/apps/errstr.c @@ -107,7 +107,6 @@ int errstr_main(int argc, char **argv) } } argc = opt_num_rest(); - argv = opt_rest(); ret = 0; for (argv = opt_rest(); *argv; argv++) { diff --git a/apps/openssl.c b/apps/openssl.c index c8912eee59..e594bd1d23 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -492,7 +492,6 @@ int help_main(int argc, char **argv) } } argc = opt_num_rest(); - argv = opt_rest(); if (argc != 0) { BIO_printf(bio_err, "Usage: %s\n", prog); @@ -320,7 +320,6 @@ int ts_main(int argc, char **argv) } } argc = opt_num_rest(); - argv = opt_rest(); if (mode == OPT_ERR || argc != 0) goto opthelp; diff --git a/apps/x509.c b/apps/x509.c index 6e6ee08ad2..6370116582 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -763,7 +763,7 @@ int x509_main(int argc, char **argv) BIO_printf(out, "/*\n" " * Subject: %s\n", buf); - m = X509_NAME_oneline(X509_get_issuer_name(x), buf, sizeof buf); + X509_NAME_oneline(X509_get_issuer_name(x), buf, sizeof buf); BIO_printf(out, " * Issuer: %s\n" " */\n", buf); diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c index 851fb91e8c..7c10b5850f 100644 --- a/crypto/asn1/asn_mime.c +++ b/crypto/asn1/asn_mime.c @@ -187,7 +187,7 @@ static ASN1_VALUE *b64_read_asn1(BIO *bio, const ASN1_ITEM *it) if (!val) ASN1err(ASN1_F_B64_READ_ASN1, ASN1_R_DECODE_ERROR); (void)BIO_flush(bio); - bio = BIO_pop(bio); + BIO_pop(bio); BIO_free(b64); return val; } |