提交 15799403 编写于 作者: B Ben Laurie

Fix more warnings.

上级 3a1daca9
...@@ -77,7 +77,7 @@ my %table=( ...@@ -77,7 +77,7 @@ my %table=(
# A few of my development configs # A few of my development configs
"purify", "purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::", "purify", "purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",
"debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::", "debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",
"debug-ben", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -Wall -Wformat -Wshadow -Werror:::::", "debug-ben", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror:::::",
"debug-rse","gcc:-DTERMIOS -DL_ENDIAN -O -g -ggdb3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", "debug-rse","gcc:-DTERMIOS -DL_ENDIAN -O -g -ggdb3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
"dist", "cc:-O -DNOPROTO::::", "dist", "cc:-O -DNOPROTO::::",
......
...@@ -2016,15 +2016,15 @@ char *str; ...@@ -2016,15 +2016,15 @@ char *str;
return(ASN1_UTCTIME_check(&tm)); return(ASN1_UTCTIME_check(&tm));
} }
static int add_oid_section(conf) static int add_oid_section(hconf)
LHASH *conf; LHASH *hconf;
{ {
char *p; char *p;
STACK *sktmp; STACK *sktmp;
CONF_VALUE *cnf; CONF_VALUE *cnf;
int i; int i;
if(!(p=CONF_get_string(conf,NULL,"oid_section"))) return 1; if(!(p=CONF_get_string(hconf,NULL,"oid_section"))) return 1;
if(!(sktmp = CONF_get_section(conf, p))) { if(!(sktmp = CONF_get_section(hconf, p))) {
BIO_printf(bio_err, "problem loading oid section %s\n", p); BIO_printf(bio_err, "problem loading oid section %s\n", p);
return 0; return 0;
} }
......
...@@ -223,14 +223,27 @@ int verify; ...@@ -223,14 +223,27 @@ int verify;
TTY_STRUCT tty_orig,tty_new; TTY_STRUCT tty_orig,tty_new;
#endif #endif
#endif #endif
int number=5; int number;
int ok=0; int ok;
int ps=0; /* statics are simply to avoid warnings about longjmp clobbering
int is_a_tty=1; things */
static int ps;
FILE *tty=NULL; int is_a_tty;
static FILE *tty;
char *p; char *p;
if (setjmp(save))
{
ok=0;
goto error;
}
number=5;
ok=0;
ps=0;
is_a_tty=1;
tty=NULL;
#ifndef MSDOS #ifndef MSDOS
if ((tty=fopen("/dev/tty","r")) == NULL) if ((tty=fopen("/dev/tty","r")) == NULL)
tty=stdin; tty=stdin;
...@@ -267,11 +280,6 @@ int verify; ...@@ -267,11 +280,6 @@ int verify;
return(-1); return(-1);
#endif #endif
if (setjmp(save))
{
ok=0;
goto error;
}
pushsig(); pushsig();
ps=1; ps=1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册