From f1b8b0010a5cdd76d1284ea47e9b5995dcd6f089 Mon Sep 17 00:00:00 2001
From: Pauli <paul.dale@oracle.com>
Date: Mon, 17 Jul 2017 11:05:13 +1000
Subject: [PATCH] Fix some pedantic warnings.

Introduced by #3862

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3944)
---
 apps/app_rand.c | 4 ++--
 apps/dgst.c     | 2 +-
 apps/passwd.c   | 2 +-
 apps/speed.c    | 2 +-
 apps/srp.c      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/app_rand.c b/apps/app_rand.c
index 960d2fe6c6..3a05352f9f 100644
--- a/apps/app_rand.c
+++ b/apps/app_rand.c
@@ -9,6 +9,7 @@
 
 #include "apps.h"
 #include <openssl/bio.h>
+#include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/conf.h>
 
@@ -33,7 +34,7 @@ void app_RAND_load_conf(CONF *c, const char *section)
 
 static int loadfiles(char *name)
 {
-    char *p, *n;
+    char *p;
     int last, ret = 1;
 
     for ( ; ; ) {
@@ -48,7 +49,6 @@ static int loadfiles(char *name)
             ERR_print_errors(bio_err);
             ret = 0;
         }
-        n = name;
         if (last)
             break;
         name = p + 1;
diff --git a/apps/dgst.c b/apps/dgst.c
index df50947603..46aa59ad24 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -34,7 +34,7 @@ typedef enum OPTION_choice {
     OPT_HEX, OPT_BINARY, OPT_DEBUG, OPT_FIPS_FINGERPRINT,
     OPT_HMAC, OPT_MAC, OPT_SIGOPT, OPT_MACOPT,
     OPT_DIGEST,
-    OPT_R_ENUM,
+    OPT_R_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS dgst_options[] = {
diff --git a/apps/passwd.c b/apps/passwd.c
index eb5a622af7..ea27c18fb7 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -66,7 +66,7 @@ typedef enum OPTION_choice {
     OPT_IN,
     OPT_NOVERIFY, OPT_QUIET, OPT_TABLE, OPT_REVERSE, OPT_APR1,
     OPT_1, OPT_5, OPT_6, OPT_CRYPT, OPT_AIXMD5, OPT_SALT, OPT_STDIN,
-    OPT_R_ENUM,
+    OPT_R_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS passwd_options[] = {
diff --git a/apps/speed.c b/apps/speed.c
index a08606006d..becdf6efcd 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -342,7 +342,7 @@ static int found(const char *name, const OPT_PAIR *pairs, int *result)
 typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
     OPT_ELAPSED, OPT_EVP, OPT_DECRYPT, OPT_ENGINE, OPT_MULTI,
-    OPT_MR, OPT_MB, OPT_MISALIGN, OPT_ASYNCJOBS, OPT_R_ENUM,
+    OPT_MR, OPT_MB, OPT_MISALIGN, OPT_ASYNCJOBS, OPT_R_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS speed_options[] = {
diff --git a/apps/srp.c b/apps/srp.c
index f67c7fff7d..c5002188a5 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -188,7 +188,7 @@ typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
     OPT_VERBOSE, OPT_CONFIG, OPT_NAME, OPT_SRPVFILE, OPT_ADD,
     OPT_DELETE, OPT_MODIFY, OPT_LIST, OPT_GN, OPT_USERINFO,
-    OPT_PASSIN, OPT_PASSOUT, OPT_ENGINE, OPT_R_ENUM,
+    OPT_PASSIN, OPT_PASSOUT, OPT_ENGINE, OPT_R_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS srp_options[] = {
-- 
2.25.1