From 2e8acde112e1c6754df26902e79a78346ba45a2d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 16 Aug 2017 16:27:55 +0200
Subject: remove UL/L suffixes from integer constants on the RHS of expressions

Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sal/osl/unx/profile.cxx |  2 +-
 sal/rtl/cipher.cxx      | 12 ++++++------
 sal/rtl/digest.cxx      | 12 ++++++------
 sal/rtl/random.cxx      |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'sal')

diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 1ff9ed0a1865..a3d029e94da2 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -1023,7 +1023,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 557ff7fdeccb..38470fbb1326 100644
--- a/sal/rtl/cipher.cxx
+++ b/sal/rtl/cipher.cxx
@@ -26,13 +26,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) \
@@ -43,7 +43,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; \
@@ -51,7 +51,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; \
@@ -66,7 +66,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; \
@@ -74,7 +74,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 178bfaa34d6d..e784c4d13de3 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -31,12 +31,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))
 
@@ -612,9 +612,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;
@@ -1034,9 +1034,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 96978ffdfbc7..4fe8b049196f 100644
--- a/sal/rtl/random.cxx
+++ b/sal/rtl/random.cxx
@@ -32,13 +32,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; \
 }
 
 struct RandomData_Impl
-- 
cgit