Fix-up ORs

Missed a few spots

diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index 821315ff34252586b112c7755e6ec97ab6399026..5ecf8a83474b83c99e674e0bdab9f98c5e47f9cd 100644 (file)
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -157,7 +157,7 @@ backendGetDeviceID(
       * bytes.  The 1284 spec says the length is stored MSB first...
       */
 
-      length = (int)((((unsigned)device_id[0] & 255) << 8) + ((unsigned)device_id[1] & 255));
+      length = (int)((((unsigned)device_id[0] & 255) << 8) | ((unsigned)device_id[1] & 255));
 
      /*
       * Check to see if the length is larger than our buffer; first
@@ -166,7 +166,7 @@ backendGetDeviceID(
       */
 
       if (length > device_id_size || length < 14)
-       length = (int)((((unsigned)device_id[1] & 255) << 8) + ((unsigned)device_id[0] & 255));
+       length = (int)((((unsigned)device_id[1] & 255) << 8) | ((unsigned)device_id[0] & 255));
 
       if (length > device_id_size)
        length = device_id_size;

diff --git a/cups/dest-options.c b/cups/dest-options.c
index a1f01d0c635448a526ced3c2709b8256432fbe13..55a75b794ba7d77dbc9f37b8a5442d1a3a757079 100644 (file)
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -1621,7 +1621,7 @@ cups_collection_string(
                  const ipp_uchar_t *date = ippGetDate(member, j);
                                        /* Date value */
 
-                 year = ((unsigned)date[0] << 8) + (unsigned)date[1];
+                 year = (date[0] << 8) | date[1];
 
                  if (date[9] == 0 && date[10] == 0)
                    snprintf(temp, sizeof(temp), "%04u-%02u-%02uT%02u:%02u:%02uZ", year, date[2], date[3], date[4], date[5], date[6]);

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 412f30c658628f017b2fb04056d9eb4866637ab9..4e990cd29c3f45fb387d563a9f3d9798e8afdb06 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1975,8 +1975,7 @@ get_addr_and_mask(const char *value,      /* I - String from config file */
                  mask + 3) != 4)
         return (0);
 
-      mask[3] |= ((unsigned)mask[0] << 24) | ((unsigned)mask[1] << 16) |
-                 ((unsigned)mask[2] << 8);
+      mask[3] |= (mask[0] << 24) | (mask[1] << 16) | (mask[2] << 8);
       mask[0] = mask[1] = mask[2] = 0;
     }
     else