diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-31 19:02:52 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-01 17:10:14 +0100 |
commit | 2a6aeea94de022b364fa5943793cdc1922df84f1 (patch) | |
tree | 5b5b47365f21bb514e785a27d61eb568a2609313 /sal/rtl | |
parent | 76af7256e04ac5a24205f76663fc20aa810a9c3d (diff) |
Removed some obsolete register annotations.
Diffstat (limited to 'sal/rtl')
-rw-r--r-- | sal/rtl/source/alloc_impl.h | 4 | ||||
-rw-r--r-- | sal/rtl/source/cipher.cxx | 4 | ||||
-rw-r--r-- | sal/rtl/source/crc.cxx | 4 | ||||
-rw-r--r-- | sal/rtl/source/digest.cxx | 46 | ||||
-rw-r--r-- | sal/rtl/source/random.cxx | 2 |
5 files changed, 30 insertions, 30 deletions
diff --git a/sal/rtl/source/alloc_impl.h b/sal/rtl/source/alloc_impl.h index 8ea038496dfa..3b63f07fe1f8 100644 --- a/sal/rtl/source/alloc_impl.h +++ b/sal/rtl/source/alloc_impl.h @@ -98,7 +98,7 @@ extern "C" { static RTL_MEMORY_INLINE int highbit(sal_Size n) { - register int k = 1; + int k = 1; if (n == 0) return (0); @@ -131,7 +131,7 @@ highbit(sal_Size n) static RTL_MEMORY_INLINE int lowbit(sal_Size n) { - register int k = 1; + int k = 1; if (n == 0) return (0); diff --git a/sal/rtl/source/cipher.cxx b/sal/rtl/source/cipher.cxx index 19647ab3186d..31c141771724 100644 --- a/sal/rtl/source/cipher.cxx +++ b/sal/rtl/source/cipher.cxx @@ -1207,8 +1207,8 @@ static rtlCipherError rtl_cipherARCFOUR_update_Impl ( const sal_uInt8 *pData, sal_Size nDatLen, sal_uInt8 *pBuffer, sal_Size nBufLen) { - register unsigned int *S; - register unsigned int x, y, t; + unsigned int *S; + unsigned int x, y, t; sal_Size k; /* Check arguments. */ diff --git a/sal/rtl/source/crc.cxx b/sal/rtl/source/crc.cxx index bd61347edc24..942bff7026c6 100644 --- a/sal/rtl/source/crc.cxx +++ b/sal/rtl/source/crc.cxx @@ -152,8 +152,8 @@ sal_uInt32 SAL_CALL rtl_crc32 ( { if (Data) { - register const sal_uInt8 *p = (const sal_uInt8 *)Data; - register const sal_uInt8 *q = p + DatLen; + const sal_uInt8 *p = (const sal_uInt8 *)Data; + const sal_uInt8 *q = p + DatLen; Crc = ~Crc; while (p < q) diff --git a/sal/rtl/source/digest.cxx b/sal/rtl/source/digest.cxx index 28655858d425..1bcc1509867c 100644 --- a/sal/rtl/source/digest.cxx +++ b/sal/rtl/source/digest.cxx @@ -83,8 +83,8 @@ struct Digest_Impl */ static void __rtl_digest_swapLong (sal_uInt32 *pData, sal_uInt32 nDatLen) { - register sal_uInt32 *X; - register int i, n; + sal_uInt32 *X; + int i, n; X = pData; n = nDatLen; @@ -308,9 +308,9 @@ static void __rtl_digest_initMD2 (DigestContextMD2 *ctx) */ static void __rtl_digest_updateMD2 (DigestContextMD2 *ctx) { - register sal_uInt8 *X; - register sal_uInt32 *sp1, *sp2; - register sal_uInt32 i, k, t; + sal_uInt8 *X; + sal_uInt32 *sp1, *sp2; + sal_uInt32 i, k, t; sal_uInt32 state[48]; @@ -353,8 +353,8 @@ static void __rtl_digest_updateMD2 (DigestContextMD2 *ctx) */ static void __rtl_digest_endMD2 (DigestContextMD2 *ctx) { - register sal_uInt8 *X; - register sal_uInt32 *C; + sal_uInt8 *X; + sal_uInt32 *C; sal_uInt32 i, n; X = ctx->m_pData; @@ -599,8 +599,8 @@ static void __rtl_digest_initMD5 (DigestContextMD5 *ctx) */ static void __rtl_digest_updateMD5 (DigestContextMD5 *ctx) { - register sal_uInt32 A, B, C, D; - register sal_uInt32 *X; + sal_uInt32 A, B, C, D; + sal_uInt32 *X; A = ctx->m_nA; B = ctx->m_nB; @@ -691,10 +691,10 @@ static void __rtl_digest_endMD5 (DigestContextMD5 *ctx) { 0x80, 0x00, 0x00, 0x00 }; - register const sal_uInt8 *p = end; + const sal_uInt8 *p = end; - register sal_uInt32 *X; - register int i; + sal_uInt32 *X; + int i; X = ctx->m_pData; i = (ctx->m_nDatLen >> 2); @@ -1029,10 +1029,10 @@ static void __rtl_digest_initSHA ( */ static void __rtl_digest_updateSHA (DigestContextSHA *ctx) { - register sal_uInt32 A, B, C, D, E, T; - register sal_uInt32 *X; + sal_uInt32 A, B, C, D, E, T; + sal_uInt32 *X; - register DigestSHA_update_t *U; + DigestSHA_update_t *U; U = ctx->m_update; A = ctx->m_nA; @@ -1142,10 +1142,10 @@ static void __rtl_digest_endSHA (DigestContextSHA *ctx) { 0x80, 0x00, 0x00, 0x00 }; - register const sal_uInt8 *p = end; + const sal_uInt8 *p = end; - register sal_uInt32 *X; - register int i; + sal_uInt32 *X; + int i; X = ctx->m_pData; i = (ctx->m_nDatLen >> 2); @@ -1625,7 +1625,7 @@ static void __rtl_digest_initHMAC_MD5 (ContextHMAC_MD5 * ctx) */ static void __rtl_digest_ipadHMAC_MD5 (ContextHMAC_MD5 * ctx) { - register sal_uInt32 i; + sal_uInt32 i; for (i = 0; i < DIGEST_CBLOCK_HMAC_MD5; i++) ctx->m_opad[i] ^= 0x36; @@ -1640,7 +1640,7 @@ static void __rtl_digest_ipadHMAC_MD5 (ContextHMAC_MD5 * ctx) */ static void __rtl_digest_opadHMAC_MD5 (ContextHMAC_MD5 * ctx) { - register sal_uInt32 i; + sal_uInt32 i; for (i = 0; i < DIGEST_CBLOCK_HMAC_MD5; i++) ctx->m_opad[i] ^= 0x5c; @@ -1857,7 +1857,7 @@ static void __rtl_digest_initHMAC_SHA1 (ContextHMAC_SHA1 * ctx) */ static void __rtl_digest_ipadHMAC_SHA1 (ContextHMAC_SHA1 * ctx) { - register sal_uInt32 i; + sal_uInt32 i; for (i = 0; i < DIGEST_CBLOCK_HMAC_SHA1; i++) ctx->m_opad[i] ^= 0x36; @@ -1872,7 +1872,7 @@ static void __rtl_digest_ipadHMAC_SHA1 (ContextHMAC_SHA1 * ctx) */ static void __rtl_digest_opadHMAC_SHA1 (ContextHMAC_SHA1 * ctx) { - register sal_uInt32 i; + sal_uInt32 i; for (i = 0; i < DIGEST_CBLOCK_HMAC_SHA1; i++) ctx->m_opad[i] ^= 0x5c; @@ -2053,7 +2053,7 @@ static void __rtl_digest_updatePBKDF2 ( { /* T_i = F (P, S, c, i) */ sal_uInt8 U[DIGEST_CBLOCK_PBKDF2]; - register sal_uInt32 i, k; + sal_uInt32 i, k; /* U_(1) = PRF (P, S || INDEX) */ rtl_digest_updateHMAC_SHA1 (hDigest, pSaltData, nSaltLen); diff --git a/sal/rtl/source/random.cxx b/sal/rtl/source/random.cxx index a8b452ac439b..774e8eb72510 100644 --- a/sal/rtl/source/random.cxx +++ b/sal/rtl/source/random.cxx @@ -105,7 +105,7 @@ static void __rtl_random_readPool ( */ static double __rtl_random_data (RandomData_Impl *pImpl) { - register double random; + double random; RTL_RANDOM_RNG (pImpl->m_nX, pImpl->m_nY, pImpl->m_nZ); random = (((double)(pImpl->m_nX) / 30328.0) + |