diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-02-28 14:05:01 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-02-28 14:05:01 +0000 |
| commit | 56c7754cab3da9745e52e36b0bf998f8356fd6d5 (patch) | |
| tree | 2662cabb231e7746ad33b8d55e90dbf4b2add3d2 | |
| parent | 92e2c81affaeb44e82fe2fdd17b201693cc2e161 (diff) | |
Avoid warnings.
| -rw-r--r-- | crypto/asn1/tasn_enc.c | 2 | ||||
| -rw-r--r-- | crypto/bn/bn_div.c | 10 | ||||
| -rw-r--r-- | crypto/cryptlib.c | 4 | ||||
| -rw-r--r-- | crypto/ex_data.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.c | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c index 03e59d59c7..b0417ba4b4 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -494,7 +494,7 @@ static int asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out, { for (i = 0, tder = derlst; i < sk_ASN1_VALUE_num(sk); i++, tder++) - sk_ASN1_VALUE_set(sk, i, tder->field); + (void)sk_ASN1_VALUE_set(sk, i, tder->field); } OPENSSL_free(derlst); OPENSSL_free(tmpdat); diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c index 8655eb118e..8adf21430e 100644 --- a/crypto/bn/bn_div.c +++ b/crypto/bn/bn_div.c @@ -325,7 +325,7 @@ X) -> 0x%08X\n", t2 -= d1; } #else /* !BN_LLONG */ - BN_ULONG t2l,t2h,ql,qh; + BN_ULONG t2l,t2h; q=bn_div_words(n0,n1,d0); #ifdef BN_DEBUG_LEVITTE @@ -343,9 +343,12 @@ X) -> 0x%08X\n", t2l = d1 * q; t2h = BN_UMULT_HIGH(d1,q); #else + { + BN_ULONG ql, qh; t2l=LBITS(d1); t2h=HBITS(d1); ql =LBITS(q); qh =HBITS(q); mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */ + } #endif for (;;) @@ -549,7 +552,7 @@ X) -> 0x%08X\n", t2 -= d1; } #else /* !BN_LLONG */ - BN_ULONG t2l,t2h,ql,qh; + BN_ULONG t2l,t2h; q=bn_div_words(n0,n1,d0); #ifdef BN_DEBUG_LEVITTE @@ -567,9 +570,12 @@ X) -> 0x%08X\n", t2l = d1 * q; t2h = BN_UMULT_HIGH(d1,q); #else + { + BN_ULONG ql, qh; t2l=LBITS(d1); t2h=HBITS(d1); ql =LBITS(q); qh =HBITS(q); mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */ + } #endif for (;;) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 2df38fa75f..33c70afa33 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -278,7 +278,7 @@ int CRYPTO_get_new_dynlockid(void) else /* If we found a place with a NULL pointer, put our pointer in it. */ - sk_CRYPTO_dynlock_set(dyn_locks,i,pointer); + (void)sk_CRYPTO_dynlock_set(dyn_locks,i,pointer); CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); if (i == -1) @@ -320,7 +320,7 @@ void CRYPTO_destroy_dynlockid(int i) #endif if (pointer->references <= 0) { - sk_CRYPTO_dynlock_set(dyn_locks, i, NULL); + (void)sk_CRYPTO_dynlock_set(dyn_locks, i, NULL); } else pointer = NULL; diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 8914218fe8..3b11e7a556 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -354,7 +354,7 @@ static int def_add_index(EX_CLASS_ITEM *item, long argl, void *argp, } } toret = item->meth_num++; - sk_CRYPTO_EX_DATA_FUNCS_set(item->meth, toret, a); + (void)sk_CRYPTO_EX_DATA_FUNCS_set(item->meth, toret, a); err: CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); return toret; diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 609606c13e..625af4fd9f 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -216,7 +216,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx) */ X509_free(x); x = xtmp; - sk_X509_set(ctx->chain, i - 1, x); + (void)sk_X509_set(ctx->chain, i - 1, x); ctx->last_untrusted=0; } } |