diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 16:27:55 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2017-11-29 14:00:55 +0100 |
| commit | 2887aefa4d4f60ba8b0cd7efd5d3a73ffb209781 (patch) | |
| tree | 4c9496d38d098e5f82442fd6a4bd9c350ba3a413 /sal | |
| parent | 85a47e76ea80c6a0676ac3b44032361733d44af3 (diff) | |
remove UL/L suffixes from integer constants on the RHS of expressions
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 2e8acde112e1c6754df26902e79a78346ba45a2d)
Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/45452
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/profile.cxx | 2 | ||||
| -rw-r--r-- | sal/rtl/cipher.cxx | 12 | ||||
| -rw-r--r-- | sal/rtl/digest.cxx | 12 | ||||
| -rw-r--r-- | sal/rtl/random.cxx | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index b62bfad8adda..a34f91ff8986 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -1035,7 +1035,7 @@ static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate) { pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf); - bRet = (lseek(pFile->m_Handle, SEEK_SET, 0L) == 0L); + bRet = (lseek(pFile->m_Handle, SEEK_SET, 0L) == 0); if (bTruncate) { diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 0f9d7cc7bd8f..266277c91be9 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -31,13 +31,13 @@ #define RTL_CIPHER_NTOHL(c, l) \ ((l) = ((sal_uInt32)(*((c)++))) << 24, \ (l) |= ((sal_uInt32)(*((c)++))) << 16, \ - (l) |= ((sal_uInt32)(*((c)++))) << 8L, \ + (l) |= ((sal_uInt32)(*((c)++))) << 8, \ (l) |= ((sal_uInt32)(*((c)++)))) #define RTL_CIPHER_HTONL(l, c) \ (*((c)++) = (sal_uInt8)(((l) >> 24) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \ - *((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \ + *((c)++) = (sal_uInt8)(((l) >> 8) & 0xff), \ *((c)++) = (sal_uInt8)(((l) ) & 0xff)) #define RTL_CIPHER_NTOHL64(c, xl, xr, n) \ @@ -48,7 +48,7 @@ { \ case 8: (xr) = ((sal_uInt32)(*(--(c)))); \ SAL_FALLTHROUGH; \ - case 7: (xr) |= ((sal_uInt32)(*(--(c)))) << 8L; \ + case 7: (xr) |= ((sal_uInt32)(*(--(c)))) << 8; \ SAL_FALLTHROUGH; \ case 6: (xr) |= ((sal_uInt32)(*(--(c)))) << 16; \ SAL_FALLTHROUGH; \ @@ -56,7 +56,7 @@ SAL_FALLTHROUGH; \ case 4: (xl) = ((sal_uInt32)(*(--(c)))); \ SAL_FALLTHROUGH; \ - case 3: (xl) |= ((sal_uInt32)(*(--(c)))) << 8L; \ + case 3: (xl) |= ((sal_uInt32)(*(--(c)))) << 8; \ SAL_FALLTHROUGH; \ case 2: (xl) |= ((sal_uInt32)(*(--(c)))) << 16; \ SAL_FALLTHROUGH; \ @@ -71,7 +71,7 @@ { \ case 8: *(--(c)) = (sal_uInt8)(((xr) ) & 0xff); \ SAL_FALLTHROUGH; \ - case 7: *(--(c)) = (sal_uInt8)(((xr) >> 8L) & 0xff); \ + case 7: *(--(c)) = (sal_uInt8)(((xr) >> 8) & 0xff); \ SAL_FALLTHROUGH; \ case 6: *(--(c)) = (sal_uInt8)(((xr) >> 16) & 0xff); \ SAL_FALLTHROUGH; \ @@ -79,7 +79,7 @@ SAL_FALLTHROUGH; \ case 4: *(--(c)) = (sal_uInt8)(((xl) ) & 0xff); \ SAL_FALLTHROUGH; \ - case 3: *(--(c)) = (sal_uInt8)(((xl) >> 8L) & 0xff); \ + case 3: *(--(c)) = (sal_uInt8)(((xl) >> 8) & 0xff); \ SAL_FALLTHROUGH; \ case 2: *(--(c)) = (sal_uInt8)(((xl) >> 16) & 0xff); \ SAL_FALLTHROUGH; \ diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx index e54ada89e5f2..43e95913be17 100644 --- a/sal/rtl/digest.cxx +++ b/sal/rtl/digest.cxx @@ -36,12 +36,12 @@ #define RTL_DIGEST_HTONL(l,c) \ (*((c)++) = (sal_uInt8)(((l) >> 24) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \ - *((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \ + *((c)++) = (sal_uInt8)(((l) >> 8) & 0xff), \ *((c)++) = (sal_uInt8)(((l) ) & 0xff)) #define RTL_DIGEST_LTOC(l,c) \ (*((c)++) = (sal_uInt8)(((l) ) & 0xff), \ - *((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \ + *((c)++) = (sal_uInt8)(((l) >> 8) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 24) & 0xff)) @@ -701,9 +701,9 @@ static void endMD5 (DigestContextMD5 *ctx) switch (ctx->m_nDatLen & 0x03) { - case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; + case 0: X[i] = ((sal_uInt32)(*(p++))) << 0; SAL_FALLTHROUGH; - case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; + case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8; SAL_FALLTHROUGH; case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16; SAL_FALLTHROUGH; @@ -1155,9 +1155,9 @@ static void endSHA (DigestContextSHA *ctx) switch (ctx->m_nDatLen & 0x03) { - case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; + case 0: X[i] = ((sal_uInt32)(*(p++))) << 0; SAL_FALLTHROUGH; - case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; + case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8; SAL_FALLTHROUGH; case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16; SAL_FALLTHROUGH; diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx index 3168c9686e28..c68ad4b94f1f 100644 --- a/sal/rtl/random.cxx +++ b/sal/rtl/random.cxx @@ -36,13 +36,13 @@ #define RTL_RANDOM_RNG(x, y, z) \ { \ (x) = 170 * ((x) % 178) - 63 * ((x) / 178); \ - if ((x) < 0) (x) += 30328L; \ + if ((x) < 0) (x) += 30328; \ \ (y) = 171 * ((y) % 177) - 2 * ((y) / 177); \ - if ((y) < 0) (y) += 30269L; \ + if ((y) < 0) (y) += 30269; \ \ (z) = 172 * ((z) % 176) - 35 * ((z) / 176); \ - if ((z) < 0) (z) += 30307L; \ + if ((z) < 0) (z) += 30307; \ } /** RandomData_Impl. |