diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-29 17:13:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-29 17:13:27 +0000 |
| commit | 94087d09d35e37a98b7bb17139ae5716e230b81d (patch) | |
| tree | 5e2eff416a2362de33ec679ca25cf217bfbb258c | |
| parent | a202fdfbad44088ed79936b3a206aaf06a836e73 (diff) | |
WaE: various new gcc 4.6.0 warnings
| -rw-r--r-- | extensions/source/plugin/unx/npnapi.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx index 35c60deb8..ed385205f 100644 --- a/extensions/source/plugin/unx/npnapi.cxx +++ b/extensions/source/plugin/unx/npnapi.cxx @@ -704,7 +704,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) gtk_widget_show( pInst->pGtkWidget ); gtk_container_add( GTK_CONTAINER(pInst->pGtkWindow), pInst->pGtkWidget ); gtk_widget_show_all( pInst->pGtkWindow ); - pInst->window.window = (void *)gtk_socket_get_id( GTK_SOCKET(pInst->pGtkWidget ) ); + pInst->window.window = (void *)(sal_uIntPtr)gtk_socket_get_id( GTK_SOCKET(pInst->pGtkWidget ) ); XSync( pAppDisplay, False ); diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 9de48239f..b310b80b8 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -347,23 +347,15 @@ X509Certificate_NssImpl* X509Certificate_NssImpl :: getImplementation( const Ref if( pCert != NULL ) { unsigned char fingerprint[20]; - //char *fpStr = NULL; - SECItem fpItem; int length = ((id == SEC_OID_MD5)?MD5_LENGTH:SHA1_LENGTH); memset(fingerprint, 0, sizeof fingerprint); PK11_HashBuf(id, fingerprint, pCert->derCert.data, pCert->derCert.len); - fpItem.data = fingerprint; - fpItem.len = length; - //fpStr = CERT_Hexify(&fpItem, 1); Sequence< sal_Int8 > thumbprint( length ) ; for( int i = 0 ; i < length ; i ++ ) - { thumbprint[i] = fingerprint[i]; - } - //PORT_Free(fpStr); return thumbprint; } else |