RT3543: Remove #ifdef LINT

I also replaced some exit/return wrappers in various
programs (from main) to standardize on return.
Reviewed-by: NRichard Levitte <levitte@openssl.org>

apps/dhparam.c

@@ -560,9 +560,6 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 	if (p == 3) c='\n';
 	BIO_write(BN_GENCB_get_arg(cb),&c,1);
 	(void)BIO_flush(BN_GENCB_get_arg(cb));
-#ifdef LINT
-	p=n;
-#endif
 	return 1;
 	}
 

apps/dsaparam.c

@@ -482,9 +482,6 @@ static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
 	if (p == 3) c='\n';
 	BIO_write(BN_GENCB_get_arg(cb),&c,1);
 	(void)BIO_flush(BN_GENCB_get_arg(cb));
-#ifdef LINT
-	p=n;
-#endif
 #ifdef GENCB_TEST
 	if(stop_keygen_flag)
 		return 0;

apps/gendh.c

@@ -233,9 +233,6 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 	if (p == 3) c='\n';
 	BIO_write(BN_GENCB_get_arg(cb),&c,1);
 	(void)BIO_flush(BN_GENCB_get_arg(cb));
-#ifdef LINT
-	p=n;
-#endif
 	return 1;
 	}
 #else /* !OPENSSL_NO_DH */

apps/genpkey.c

@@ -433,8 +433,5 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx)
 	if (p == 3) c='\n';
 	BIO_write(b,&c,1);
 	(void)BIO_flush(b);
-#ifdef LINT
-	p=n;
-#endif
 	return 1;
 	}

apps/genrsa.c

@@ -327,9 +327,6 @@ static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
 	if (p == 3) c='\n';
 	BIO_write(BN_GENCB_get_arg(cb),&c,1);
 	(void)BIO_flush(BN_GENCB_get_arg(cb));
-#ifdef LINT
-	p=n;
-#endif
 	return 1;
 	}
 #else /* !OPENSSL_NO_RSA */

apps/req.c

@@ -1773,9 +1773,6 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx)
 	if (p == 3) c='\n';
 	BIO_write(b,&c,1);
 	(void)BIO_flush(b);
-#ifdef LINT
-	p=n;
-#endif
 	return 1;
 	}
 

apps/speed.c

@@ -272,9 +272,6 @@ static SIGRETTYPE sig_done(int sig)
 	{
 	signal(SIGALRM,sig_done);
 	run=0;
-#ifdef LINT
-	sig=sig;
-#endif
 	}
 #endif
 
@@ -2648,9 +2645,6 @@ static void print_message(const char *s, long num, int length)
 	BIO_printf(bio_err,mr ? "+DN:%s:%ld:%d\n"
 		   : "Doing %s %ld times on %d size blocks: ",s,num,length);
 	(void)BIO_flush(bio_err);
-#endif
-#ifdef LINT
-	num=num;
 #endif
 	}
 
@@ -2666,9 +2660,6 @@ static void pkey_print_message(const char *str, const char *str2, long num,
 	BIO_printf(bio_err,mr ? "+DNP:%ld:%d:%s:%s\n"
 			   : "Doing %ld %d bit %s %s's: ",num,bits,str,str2);
 	(void)BIO_flush(bio_err);
-#endif
-#ifdef LINT
-	num=num;
 #endif
 	}
 

crypto/asn1/asn1_par.c

@@ -133,9 +133,6 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse
 		{
 		op=p;
 		j=ASN1_get_object(&p,&len,&tag,&xclass,length);
-#ifdef LINT
-		j=j;
-#endif
 		if (j & 0x80)
 			{
 			if (BIO_write(bp,"Error in encoding\n",18) <= 0)

crypto/des/read_pwd.c

@@ -462,9 +462,6 @@ static void popsig(void)
 static void recsig(int i)
 	{
 	longjmp(save,1);
-#ifdef LINT
-	i=i;
-#endif
 	}
 
 #ifdef OPENSSL_SYS_MSDOS

crypto/des/rpw.c

@@ -86,14 +86,8 @@ int main(int argc, char *argv[])
 		for (i=0; i<8; i++)
 			printf("%02x ",k1[i]);
 		printf("\n");
-		exit(1);
+		return(1);
 		}
-	else
-		{
-		printf("error %d\n",i);
-		exit(0);
-		}
-#ifdef LINT
+	printf("error %d\n",i);
 	return(0);
-#endif
 	}

crypto/dh/dhtest.c

@@ -226,9 +226,6 @@ static int MS_CALLBACK cb(int p, int n, BN_GENCB *arg)
 	if (p == 3) c='\n';
 	BIO_write(BN_GENCB_get_arg(arg),&c,1);
 	(void)BIO_flush(BN_GENCB_get_arg(arg));
-#ifdef LINT
-	p=n;
-#endif
 	return 1;
 	}
 

crypto/ecdh/ecdhtest.c

@@ -537,9 +537,6 @@ static void MS_CALLBACK cb(int p, int n, void *arg)
 	if (p == 3) c='\n';
 	BIO_write((BIO *)arg,&c,1);
 	(void)BIO_flush((BIO *)arg);
-#ifdef LINT
-	p=n;
-#endif
 	}
 #endif
 #endif