Locally declare some variables

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>

diff --git a/apps/ca.c b/apps/ca.c
index 49e7f52a2aa998e30feb8872a9613bbd8e26cb9e..e8a07130516633c506769356124845db2c7ab734 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -133,9 +133,7 @@ char *make_revocation_str(int rev_type, char *rev_arg);
 int make_revoked(X509_REVOKED *rev, const char *str);
 static int old_entry_print(ASN1_OBJECT *obj, ASN1_STRING *str);
 
-static CONF *conf = NULL;
 static CONF *extconf = NULL;
-static char *section = NULL;
 static int preserve = 0;
 static int msie_hack = 0;
 
@@ -220,6 +218,7 @@ OPTIONS ca_options[] = {
 
 int ca_main(int argc, char **argv)
 {
+    CONF *conf = NULL;
     ENGINE *e = NULL;
     BIGNUM *crlnumber = NULL, *serial = NULL;
     EVP_PKEY *pkey = NULL;
@@ -233,7 +232,7 @@ int ca_main(int argc, char **argv)
     STACK_OF(X509) *cert_sk = NULL;
     X509_CRL *crl = NULL;
     const EVP_MD *dgst = NULL;
-    char *configfile = default_config_file;
+    char *configfile = default_config_file, *section = NULL;
     char *md = NULL, *policy = NULL, *keyfile = NULL;
     char *certfile = NULL, *crl_ext = NULL, *crlnumberfile = NULL;
     char *infile = NULL, *spkac_file = NULL, *ss_cert_file = NULL;

diff --git a/apps/s_client.c b/apps/s_client.c
index 01d1036209e2c32bd471e1b110ac9b76259d6a6f..d8678c39efe3f420abef5b4f758b95e117bc5267 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -89,9 +89,6 @@ extern int verify_return_error;
 extern int verify_quiet;
 
 static char *prog;
-static int async = 0;
-static unsigned int split_send_fragment = 0;
-static unsigned int max_pipelines = 0;
 static int c_nbio = 0;
 static int c_tlsextdebug = 0;
 static int c_status_req = 0;
@@ -841,6 +838,9 @@ int s_client_main(int argc, char **argv)
     int ct_validation = 0;
 #endif
     int min_version = 0, max_version = 0;
+    int async = 0;
+    unsigned int split_send_fragment = 0;
+    unsigned int max_pipelines = 0;
 
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);