From 69e2b8d67d980b4dea8c5f2cb17cd86455989bb7 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Mon, 19 Mar 2018 10:23:28 -0400 Subject: Revise and cleanup; use strict,warnings Use shorter names for some defines, so also had to change the .c file that used them. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/5669) --- crypto/conf/conf_def.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto/conf/conf_def.c') diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 752859d9e7..05ba1c9358 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -558,7 +558,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from) s++; cp = section; e = np = s; - while (IS_ALPHA_NUMERIC(conf, *e)) + while (IS_ALNUM(conf, *e)) e++; if ((e[0] == ':') && (e[1] == ':')) { cp = np; @@ -567,7 +567,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from) *rrp = '\0'; e += 2; np = e; - while (IS_ALPHA_NUMERIC(conf, *e)) + while (IS_ALNUM(conf, *e)) e++; } r = *e; @@ -759,7 +759,7 @@ static char *eat_alpha_numeric(CONF *conf, char *p) p = scan_esc(conf, p); continue; } - if (!IS_ALPHA_NUMERIC_PUNCT(conf, *p)) + if (!IS_ALNUM_PUNCT(conf, *p)) return p; p++; } -- cgit v1.2.3