Commit 56c7754c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Avoid warnings.

parent 92e2c81a

crypto/asn1/tasn_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/bn/bn_div.c

+8 −2
Original line number Diff line number Diff line
@@ -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 (;;)

crypto/cryptlib.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

crypto/ex_data.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

crypto/x509/x509_vfy.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

				}

			}