Enable -Wshadow in openssl(1) and fix a few shadow warnings.

ok jsing@

1 files changed, 7 insertions, 9 deletions

diff --git a/src/usr.bin/openssl/s_time.c b/src/usr.bin/openssl/s_time.c
index f8c104b7d7..7279883c87 100644
--- a/src/usr.bin/openssl/s_time.c
+++ b/src/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_time.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: s_time.c,v 1.2 2014/09/01 20:54:37 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -213,8 +213,6 @@ parseArgs(int argc, char **argv)
                 else if (strcmp(*argv, "-new") == 0)
                         perform = 1;
                 else if (strcmp(*argv, "-verify") == 0) {
-                        const char *errstr;
-
                         tm_verify = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
                         if (--argc < 1)
                                 goto bad;
@@ -375,9 +373,9 @@ s_time_main(int argc, char **argv)
                         goto end;
 
                 if (s_www_path != NULL) {
-                        int ret = snprintf(buf, sizeof buf,
+                        int retval = snprintf(buf, sizeof buf,
                             "GET %s HTTP/1.0\r\n\r\n", s_www_path);
-                        if (ret == -1 || ret >= sizeof buf) {
+                        if ((size_t)retval >= sizeof buf) {
                                 fprintf(stderr, "URL too long\n");
                                 goto end;
                         }
@@ -435,9 +433,9 @@ next:
                 goto end;
         }
         if (s_www_path != NULL) {
-                int ret = snprintf(buf, sizeof buf,
+                int retval = snprintf(buf, sizeof buf,
                     "GET %s HTTP/1.0\r\n\r\n", s_www_path);
-                if (ret == -1 || ret >= sizeof buf) {
+                if ((size_t)retval >= sizeof buf) {
                         fprintf(stderr, "URL too long\n");
                         goto end;
                 }
@@ -468,9 +466,9 @@ next:
                         goto end;
 
                 if (s_www_path) {
-                        int ret = snprintf(buf, sizeof buf,
+                        int retval = snprintf(buf, sizeof buf,
                             "GET %s HTTP/1.0\r\n\r\n", s_www_path);
-                        if (ret == -1 || ret >= sizeof buf) {
+                        if ((size_t)retval >= sizeof buf) {
                                 fprintf(stderr, "URL too long\n");
                                 goto end;
                         }