Fix some pedantic warnings.

Introduced by #3862

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3944)
This commit is contained in:
Pauli 2017-07-17 11:05:13 +10:00
parent 3ee1eac27a
commit f1b8b0010a
5 changed files with 6 additions and 6 deletions

View file

@ -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;

View file

@ -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[] = {

View file

@ -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[] = {

View file

@ -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[] = {

View file

@ -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[] = {