Commit 15799403 authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix more warnings.

parent 3a1daca9

Configure

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ my %table=( 
# A few of my development configs

"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-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",

"dist",		"cc:-O -DNOPROTO::::",

apps/ca.c

+4 −4
Original line number Diff line number Diff line
@@ -2016,15 +2016,15 @@ char *str; 
	return(ASN1_UTCTIME_check(&tm));

	}



static int add_oid_section(conf)

LHASH *conf;

static int add_oid_section(hconf)

LHASH *hconf;

{	

	char *p;

	STACK *sktmp;

	CONF_VALUE *cnf;

	int i;

	if(!(p=CONF_get_string(conf,NULL,"oid_section"))) return 1;

	if(!(sktmp = CONF_get_section(conf, p))) {

	if(!(p=CONF_get_string(hconf,NULL,"oid_section"))) return 1;

	if(!(sktmp = CONF_get_section(hconf, p))) {

		BIO_printf(bio_err, "problem loading oid section %s\n", p);

		return 0;

	}

crypto/des/read_pwd.c

+19 −11
Original line number Diff line number Diff line
@@ -223,14 +223,27 @@ int verify; 
	TTY_STRUCT tty_orig,tty_new;

#endif

#endif

	int number=5;

	int ok=0;

	int ps=0;

	int is_a_tty=1;



	FILE *tty=NULL;

	int number;

	int ok;

	/* statics are simply to avoid warnings about longjmp clobbering

	   things */

	static int ps;

	int is_a_tty;

	static FILE *tty;

	char *p;



	if (setjmp(save))

		{

		ok=0;

		goto error;

		}



	number=5;

	ok=0;

	ps=0;

	is_a_tty=1;

	tty=NULL;



#ifndef MSDOS

	if ((tty=fopen("/dev/tty","r")) == NULL)

		tty=stdin;
@@ -267,11 +280,6 @@ int verify; 
		return(-1);

#endif



	if (setjmp(save))

		{

		ok=0;

		goto error;

		}

	pushsig();

	ps=1;