wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RT3543: Remove #ifdef LINT

Browse source 
I also replaced some exit/return wrappers in various
programs (from main) to standardize on return.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2014-09-23 13:23:09 -04:00
parent a4a934119d
commit 5cf37957fb
12 changed files with 2 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/dhparam.c
View file

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

3
apps/dsaparam.c
View file

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

3
apps/gendh.c
View file

@ -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 */

3
apps/genpkey.c
View file

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

3
apps/genrsa.c
View file

@ -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 */

3
apps/req.c
View file

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

9
apps/speed.c
View file

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

3
crypto/asn1/asn1_par.c
View file

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

3
crypto/des/read_pwd.c
View file

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

10
crypto/des/rpw.c
View file

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

3
crypto/dh/dhtest.c
View file

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

3
crypto/ecdh/ecdhtest.c
View file

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