RT3543: Remove #ifdef LINT

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

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/apps/dhparam.c b/apps/dhparam.c
index c4cf1685a35f97f1cf4dbd1b2a5f5fb897ca73d7..1127d10c1c8a8c03d1e1755708569a4be6b177b4 100644 (file)
--- a/apps/dhparam.c
+++ b/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;
        }
 

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index e51f5026de84ba4f92458d2b697262ade9aa0ec0..8ee5d42ae756b88e0657af46b5364a151a3a3639 100644 (file)
--- a/apps/dsaparam.c
+++ b/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;

diff --git a/apps/gendh.c b/apps/gendh.c
index 1536cbf3d2393cbd35569c2dbaa79220a4a4e626..c8645a4993a69b9078813e8bdde06411617c3b30 100644 (file)
--- a/apps/gendh.c
+++ b/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 */

diff --git a/apps/genpkey.c b/apps/genpkey.c
index 6dfda08b9e09f2d7ca3e4bea10f3ce27e8ffebeb..685e2c6b162d38a7df76b7b14397d3740f390dea 100644 (file)
--- a/apps/genpkey.c
+++ b/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;
        }

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 7b0bcc20e1961067f3dac66801e72b6f76269982..54e30d343bdb5272dfa1c4bbc3dc786ebce979a2 100644 (file)
--- a/apps/genrsa.c
+++ b/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 */

diff --git a/apps/req.c b/apps/req.c
index 6a19144931c68464549da95ea85b155fe334a924..87ab41293d1d39add005890cdf234828a5f0801b 100644 (file)
--- a/apps/req.c
+++ b/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;
        }
 

diff --git a/apps/speed.c b/apps/speed.c
index b5d7921e5f138f69a3e5aa1ec82d70ea93245b65..e5742e624bfa42a46ae42eb725abab3c0e0d00e8 100644 (file)
--- a/apps/speed.c
+++ b/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
        }
 

diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index aaca69aebd94ca286bac91742f5db55957674109..147aa475218336b0e9fc80f36f644813bcc76e3b 100644 (file)
--- a/crypto/asn1/asn1_par.c
+++ b/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)

diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c
index 7e3f9020dca619c3c27d4583bd8b1847053f19a2..ffc458a9c67371757c3b16bda6bdd94938049aa6 100644 (file)
--- a/crypto/des/read_pwd.c
+++ b/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

diff --git a/crypto/des/rpw.c b/crypto/des/rpw.c
index 8a9473c4f9051f4ef7dcb016a5ea5607134f17d8..af1f0cf73f8aa5322a999c39cc238446dd110fc6 100644 (file)
--- a/crypto/des/rpw.c
+++ b/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
        }

diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c
index 1d49d0462b7a47f5eb822ffe2d4ca6459d158566..c98c8047a62b3ddbeccfdc66da21df9692d09ccf 100644 (file)
--- a/crypto/dh/dhtest.c
+++ b/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;
        }
 

diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c
index 4b861fef6143ad674c604feb34261576b960aae4..e4c09455f1aa5db83b066cec00d3081150bef5fe 100644 (file)
--- a/crypto/ecdh/ecdhtest.c
+++ b/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