diff options
| author | Kenneth Venken <kenneth.venken@gmail.com> | 2010-12-03 13:59:47 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-12-03 13:59:47 +0000 |
| commit | 39fc2df3c1d8e8bc8b689e2d21c193bc4886bf8c (patch) | |
| tree | c663b430fd156eab527bbc3efa3def2b85b8ede2 /xmlsecurity | |
| parent | 0bdef7cec695042a2259c327fc4ea84c74babd0f (diff) | |
more Sal n elements
Diffstat (limited to 'xmlsecurity')
3 files changed, 6 insertions, 4 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 693f89bb97fc..f5aefaecded5 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -38,6 +38,7 @@ #pragma warning(pop) #endif #include <sal/config.h> +#include <sal/macros.h> #include <osl/thread.h> #include "securityenvironment_mscryptimpl.hxx" @@ -114,11 +115,10 @@ CertErrorToString arErrStrings[] = void traceTrustStatus(DWORD err) { - int numErrors = sizeof(arErrStrings) / sizeof(CertErrorToString); xmlsec_trace("The certificate error status is: "); if (err == 0) xmlsec_trace("%s", arErrStrings[0].name); - for (int i = 1; i < numErrors; i++) + for (int i = 1; i < SAL_N_ELEMENTS(arErrStrings); i++) { if (arErrStrings[i].error & err) xmlsec_trace("%s", arErrStrings[i].name); diff --git a/xmlsecurity/source/xmlsec/nss/secerror.cxx b/xmlsecurity/source/xmlsec/nss/secerror.cxx index cc7fdd27e0f5..0c2f71122849 100644 --- a/xmlsecurity/source/xmlsec/nss/secerror.cxx +++ b/xmlsecurity/source/xmlsec/nss/secerror.cxx @@ -34,6 +34,7 @@ #include "sslerr.h" #include "nspr.h" #include "certt.h" +#include <sal/macros.h> #include "../diagnose.hxx" @@ -61,7 +62,7 @@ const char * getCertError(PRErrorCode errNum) { static char sEmpty[] = ""; - const int numDesc = sizeof(allDesc) / sizeof(ErrDesc); + const int numDesc = SAL_N_ELEMENTS(allDesc); for (int i = 0; i < numDesc; i++) { if (allDesc[i].errNum == errNum) diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index f31de65ff553..49c7ba71adcc 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -37,6 +37,7 @@ #include "ocsp.h" #include <sal/config.h> +#include <sal/macros.h> #include "securityenvironment_nssimpl.hxx" #include "x509certificate_nssimpl.hxx" #include <rtl/uuid.h> @@ -882,7 +883,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, {certificateUsageEmailRecipient, "certificateUsageEmailRecipient"} }; - int numUsages = sizeof(arUsages) / sizeof(UsageDescription); + int numUsages = SAL_N_ELEMENTS(arUsages); for (int i = 0; i < numUsages; i++) { xmlsec_trace("Testing usage %d of %d: %s (0x%x)", i + 1, |