OpenSSL: openssl/crypto/asn1/ tasn_enc.c openssl/crypto/bn/ bn_d...

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
28-Feb-2008 15:05:02
  Branch: HEAD                             Handle:
2008022814045803

  Modified files:
    openssl/crypto          cryptlib.c ex_data.c
    openssl/crypto/asn1     tasn_enc.c
    openssl/crypto/bn       bn_div.c
    openssl/crypto/x509     x509_vfy.c

  Log:
    Avoid warnings.

  Summary:
    Revision    Changes     Path
    1.19        +1  -1      openssl/crypto/asn1/tasn_enc.c
    1.44        +8  -2      openssl/crypto/bn/bn_div.c
    1.68        +2  -2      openssl/crypto/cryptlib.c
    1.19        +1  -1      openssl/crypto/ex_data.c
    1.92        +1  -1      openssl/crypto/x509/x509_vfy.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/asn1/tasn_enc.c
 
============================================================
================
  $ cvs diff -u -r1.18 -r1.19 tasn_enc.c
  --- openssl/crypto/asn1/tasn_enc.c	18 Sep 2007 22:15:25
-0000	1.18
  +++ openssl/crypto/asn1/tasn_enc.c	28 Feb 2008 14:04:59
-0000	1.19
   -494,7 +494,7 
   		{
   		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);
   .
  patch -p0 <<' .'
  Index: openssl/crypto/bn/bn_div.c
 
============================================================
================
  $ cvs diff -u -r1.43 -r1.44 bn_div.c
  --- openssl/crypto/bn/bn_div.c	11 Jun 2007 16:33:02
-0000	1.43
  +++ openssl/crypto/bn/bn_div.c	28 Feb 2008 14:05:01
-0000	1.44
   -325,7 +325,7 
   				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 
   			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 
   				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 
   			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 (;;)
   .
  patch -p0 <<' .'
  Index: openssl/crypto/cryptlib.c
 
============================================================
================
  $ cvs diff -u -r1.67 -r1.68 cryptlib.c
  --- openssl/crypto/cryptlib.c	3 Feb 2007 17:32:47
-0000	1.67
  +++ openssl/crypto/cryptlib.c	28 Feb 2008 14:04:58
-0000	1.68
   -278,7 +278,7 
   	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 
   #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;
   .
  patch -p0 <<' .'
  Index: openssl/crypto/ex_data.c
 
============================================================
================
  $ cvs diff -u -r1.18 -r1.19 ex_data.c
  --- openssl/crypto/ex_data.c	19 Apr 2004 18:09:22
-0000	1.18
  +++ openssl/crypto/ex_data.c	28 Feb 2008 14:04:58
-0000	1.19
   -354,7 +354,7 
   			}
   		}
   	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;
   .
  patch -p0 <<' .'
  Index: openssl/crypto/x509/x509_vfy.c
 
============================================================
================
  $ cvs diff -u -r1.91 -r1.92 x509_vfy.c
  --- openssl/crypto/x509/x509_vfy.c	7 Sep 2007 13:25:13
-0000	1.91
  +++ openssl/crypto/x509/x509_vfy.c	28 Feb 2008 14:05:01
-0000	1.92
   -216,7 +216,7 
   				 */
   				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;
   				}
   			}
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org