Use bitwise OR instead of addition

diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index 09e343668c988999dad9c3015ba6b8da4aecbae0..f0373c0440d41ab04c4451696bcdf0ed0c537551 100644 (file)
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1046,7 +1046,7 @@ get_device_id(usb_printer_t *printer,     /* I - Printer */
               char          *buffer,   /* I - String buffer */
               size_t        bufsize)   /* I - Number of bytes in buffer */
 {
-  int  length;                         /* Length of device ID */
+  size_t       length;                         /* Length of device ID */
 
 
   if (libusb_control_transfer(printer->handle,
@@ -1065,7 +1065,7 @@ get_device_id(usb_printer_t *printer,     /* I - Printer */
   * bytes.  The 1284 spec says the length is stored MSB first...
   */
 
-  length = (int)((((unsigned)buffer[0] & 255) << 8) | ((unsigned)buffer[1] & 255));
+  length = (((unsigned)buffer[0] & 255) << 8) | ((unsigned)buffer[1] & 255);
 
  /*
   * Check to see if the length is larger than our buffer or less than 14 bytes
@@ -1076,7 +1076,7 @@ get_device_id(usb_printer_t *printer,     /* I - Printer */
   */
 
   if (length > bufsize || length < 14)
-    length = (int)((((unsigned)buffer[1] & 255) << 8) | ((unsigned)buffer[0] & 255));
+    length = (((unsigned)buffer[1] & 255) << 8) | ((unsigned)buffer[0] & 255);
 
   if (length > bufsize)
     length = bufsize;
@@ -1098,7 +1098,7 @@ get_device_id(usb_printer_t *printer,     /* I - Printer */
   * nul-terminate.
   */
 
-  memmove(buffer, buffer + 2, (size_t)length);
+  memmove(buffer, buffer + 2, length);
   buffer[length] = '\0';
 
   return (0);

diff --git a/cups/file.c b/cups/file.c
index 2c85ef5c25561a46334331a053549c74d73a69ed..2fd07808046ac15df5a85a7a28dc3fbf643ce0b7 100644 (file)
--- a/cups/file.c
+++ b/cups/file.c
@@ -2513,8 +2513,7 @@ cups_fill(cups_file_t *fp)                /* I - CUPS file */
          }
        }
 
-       tcrc = ((((((uLong)trailer[3] << 8) | (uLong)trailer[2]) << 8) |
-               (uLong)trailer[1]) << 8) | (uLong)trailer[0];
+       tcrc = ((uLong)trailer[3] << 24) | ((uLong)trailer[2] << 16) | ((uLong)trailer[1] << 8) | ((uLong)trailer[0]);
 
        if (tcrc != fp->crc)
        {

diff --git a/cups/http-addr.c b/cups/http-addr.c
index 114a6449a2e4ed2003803e89d559fcef2e7dbd5b..a61ee044908325e3b2a21143b25d0d2ed8055494 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -746,9 +746,7 @@ httpGetHostByName(const char *name) /* I - Hostname or IP address */
     if (ip[0] > 255 || ip[1] > 255 || ip[2] > 255 || ip[3] > 255)
       return (NULL);                   /* Invalid byte ranges! */
 
-    cg->ip_addr = htonl((((((((unsigned)ip[0] << 8) | (unsigned)ip[1]) << 8) |
-                           (unsigned)ip[2]) << 8) |
-                         (unsigned)ip[3]));
+    cg->ip_addr = htonl((ip[0] << 24) | (ip[1] << 16) | (ip[2] << 8) | ip[3]);
 
    /*
     * Fill in the host entry and return it...

diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index ccf7b5192a83e514706ebd46f2e711370e2d8506..c38c9107e6356195aa729d8b2d617ad155d8ba13 100644 (file)
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -746,10 +746,7 @@ httpAddrGetList(const char *hostname,      /* I - Hostname, IP address, or NULL for p
            return (NULL);
 
           first->addr.ipv4.sin_family = AF_INET;
-          first->addr.ipv4.sin_addr.s_addr = htonl((((((((unsigned)ip[0] << 8) |
-                                                      (unsigned)ip[1]) << 8) |
-                                                    (unsigned)ip[2]) << 8) |
-                                                  (unsigned)ip[3]));
+          first->addr.ipv4.sin_addr.s_addr = htonl((ip[0] << 24) | (ip[1] << 16) | (ip[2] << 8) | ip[3]);
           first->addr.ipv4.sin_port = htons(portnum);
        }
       }

diff --git a/cups/http-support.c b/cups/http-support.c
index e02dffe44055eea6699230b008d8963e2505acd6..3c27e6ec6f448e50f27e82c8dc27b8da2dd5acd7 100644 (file)
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -729,7 +729,7 @@ httpEncode64_2(char       *out,             /* I - String to write to */
       if (inlen > 1)
         *outptr ++ = base64[(((in[0] & 255) << 4) | ((in[1] & 255) >> 4)) & 63];
       else
-        *outptr ++ = base64[((in[0] & 255) << 4) & 63];
+        *outptr ++ = base64[(in[0] << 4) & 63];
     }
 
     in ++;
@@ -746,9 +746,9 @@ httpEncode64_2(char       *out,             /* I - String to write to */
     if (outptr < outend)
     {
       if (inlen > 1)
-        *outptr ++ = base64[(((in[0] & 255) << 2) | ((in[1] & 255) >> 6)) & 63];
+        *outptr ++ = base64[((in[0] << 2) | (in[1] >> 6)) & 63];
       else
-        *outptr ++ = base64[((in[0] & 255) << 2) & 63];
+        *outptr ++ = base64[(in[0] << 2) & 63];
     }
 
     in ++;

diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index e1273c1ed240afdff3f99c4583be7a0021ad4516..bb0c6c8bd9089e5610db024673cbe28ba56fa915 100644 (file)
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -743,7 +743,7 @@ ippAttributeString(
           {
             unsigned year;             /* Year */
 
-            year = ((unsigned)val->date[0] << 8) + (unsigned)val->date[1];
+            year = ((unsigned)val->date[0] << 8) | (unsigned)val->date[1];
 
            if (val->date[9] == 0 && val->date[10] == 0)
              snprintf(temp, sizeof(temp), "%04u-%02u-%02uT%02u:%02u:%02uZ",

diff --git a/cups/ipp.c b/cups/ipp.c
index 60af64b9c93d4cba3b8d9bab2e4a17d871130bd6..4db4e062631fec3d14d540a66bd999626d95b8a6 100644 (file)
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -2910,9 +2910,8 @@ ippReadIO(void       *src,                /* I - Data source */
 
           ipp->request.any.version[0]  = buffer[0];
           ipp->request.any.version[1]  = buffer[1];
-          ipp->request.any.op_status   = (buffer[2] << 8) | buffer[3];
-          ipp->request.any.request_id  = (((((buffer[4] << 8) | buffer[5]) << 8) |
-                                        buffer[6]) << 8) | buffer[7];
+          ipp->request.any.op_status = (buffer[2] << 8) | buffer[3];
+          ipp->request.any.request_id = (buffer[4] << 24) | (buffer[5] << 16) | (buffer[6] << 8) | buffer[7];
 
           DEBUG_printf(("2ippReadIO: version=%d.%d", buffer[0], buffer[1]));
          DEBUG_printf(("2ippReadIO: op_status=%04x",
@@ -2961,8 +2960,7 @@ ippReadIO(void       *src,                /* I - Data source */
              goto rollback;
            }
 
-           tag = (ipp_tag_t)((((((buffer[0] << 8) | buffer[1]) << 8) |
-                               buffer[2]) << 8) | buffer[3]);
+           tag = (ipp_tag_t)((buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]);
 
             if (tag & IPP_TAG_CUPS_CONST)
             {
@@ -3262,8 +3260,7 @@ ippReadIO(void       *src,                /* I - Data source */
                  goto rollback;
                }
 
-               n = (((((buffer[0] << 8) | buffer[1]) << 8) | buffer[2]) << 8) |
-                   buffer[3];
+               n = (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
 
                 if (attr->value_tag == IPP_TAG_RANGE)
                   value->range.lower = value->range.upper = n;
@@ -3363,14 +3360,9 @@ ippReadIO(void       *src,               /* I - Data source */
                  goto rollback;
                }
 
-                value->resolution.xres =
-                   (((((buffer[0] << 8) | buffer[1]) << 8) | buffer[2]) << 8) |
-                   buffer[3];
-                value->resolution.yres =
-                   (((((buffer[4] << 8) | buffer[5]) << 8) | buffer[6]) << 8) |
-                   buffer[7];
-                value->resolution.units =
-                   (ipp_res_t)buffer[8];
+                value->resolution.xres  = (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
+                value->resolution.yres  = (buffer[4] << 24) | (buffer[5] << 16) | (buffer[6] << 8) | buffer[7];
+                value->resolution.units = (ipp_res_t)buffer[8];
                break;
 
            case IPP_TAG_RANGE :
@@ -3389,12 +3381,8 @@ ippReadIO(void       *src,               /* I - Data source */
                  goto rollback;
                }
 
-                value->range.lower =
-                   (((((buffer[0] << 8) | buffer[1]) << 8) | buffer[2]) << 8) |
-                   buffer[3];
-                value->range.upper =
-                   (((((buffer[4] << 8) | buffer[5]) << 8) | buffer[6]) << 8) |
-                   buffer[7];
+                value->range.lower = (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
+                value->range.upper = (buffer[4] << 24) | (buffer[5] << 16) | (buffer[6] << 8) | buffer[7];
                break;
 
            case IPP_TAG_TEXTLANG :

diff --git a/cups/md5.c b/cups/md5.c
index a94646c727e760f378b517f02ec6620ea2749b2d..38d23b4a2a022b55cfd6cd67bee2fcf945d52f7f 100644 (file)
--- a/cups/md5.c
+++ b/cups/md5.c
@@ -131,8 +131,8 @@ _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/)
     int i;
 
     for (i = 0; i < 16; ++i, xp += 4)
-       X[i] = (unsigned)xp[0] + ((unsigned)xp[1] << 8) +
-              ((unsigned)xp[2] << 16) + ((unsigned)xp[3] << 24);
+       X[i] = (unsigned)xp[0] | ((unsigned)xp[1] << 8) |
+              ((unsigned)xp[2] << 16) | ((unsigned)xp[3] << 24);
 
 #  else  /* !ARCH_IS_BIG_ENDIAN */
 

diff --git a/cups/raster-stream.c b/cups/raster-stream.c
index aab45e79233ca52c48e5f202786f9c452027eb37..c51869e4fc98fe429e9cee162157d0da28405f17 100644 (file)
--- a/cups/raster-stream.c
+++ b/cups/raster-stream.c
@@ -685,12 +685,11 @@ _cupsRasterReadHeader(
           r->header.cupsColorSpace   = appleheader[1] >= (sizeof(rawcspace) / sizeof(rawcspace[0])) ? CUPS_CSPACE_DEVICE1 : rawcspace[appleheader[1]];
           r->header.cupsNumColors    = appleheader[1] >= (sizeof(rawnumcolors) / sizeof(rawnumcolors[0])) ? 1 : rawnumcolors[appleheader[1]];
           r->header.cupsBitsPerColor = r->header.cupsBitsPerPixel / r->header.cupsNumColors;
-          r->header.cupsWidth        = ((((((unsigned)appleheader[12] << 8) | (unsigned)appleheader[13]) << 8) | (unsigned)appleheader[14]) << 8) | (unsigned)appleheader[15];
-          r->header.cupsHeight       = ((((((unsigned)appleheader[16] << 8) | (unsigned)appleheader[17]) << 8) | (unsigned)appleheader[18]) << 8) | (unsigned)appleheader[19];
+          r->header.cupsWidth        = ((unsigned)appleheader[12] << 24) | ((unsigned)appleheader[13] << 16) | ((unsigned)appleheader[14] << 8) | (unsigned)appleheader[15];
+          r->header.cupsHeight       = ((unsigned)appleheader[16] << 24) | ((unsigned)appleheader[17] << 16) | ((unsigned)appleheader[18] << 8) | (unsigned)appleheader[19];
           r->header.cupsBytesPerLine = r->header.cupsWidth * r->header.cupsBitsPerPixel / 8;
           r->header.cupsColorOrder   = CUPS_ORDER_CHUNKED;
-          r->header.HWResolution[0]  = r->header.HWResolution[1] = ((((((unsigned)appleheader[20] << 8) | (unsigned)appleheader[21]) << 8) | (unsigned)appleheader[22]) << 8) | (unsigned)appleheader[23];
-
+          r->header.HWResolution[0]  = r->header.HWResolution[1] = ((unsigned)appleheader[20] << 24) | ((unsigned)appleheader[21] << 16) | ((unsigned)appleheader[22] << 8) | (unsigned)appleheader[23];
           if (r->header.HWResolution[0] > 0)
           {
            r->header.PageSize[0]     = (r->header.cupsWidth * 72 / r->header.HWResolution[0]);

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 168ee9ef9c6e75f9e7fc057924e5199da8261300..412f30c658628f017b2fb04056d9eb4866637ab9 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1948,8 +1948,7 @@ get_addr_and_mask(const char *value,      /* I - String from config file */
     * Merge everything into a 32-bit IPv4 address in ip[3]...
     */
 
-    ip[3] = ((((((unsigned)val[0] << 8) | (unsigned)val[1]) << 8) |
-             (unsigned)val[2]) << 8) | (unsigned)val[3];
+    ip[3] = (val[0] << 24) | (val[1] << 16) | (val[2] << 8) | val[3];
 
     if (ipcount < 4)
       mask[3] = (0xffffffff << (32 - 8 * ipcount)) & 0xffffffff;
@@ -1976,8 +1975,8 @@ get_addr_and_mask(const char *value,      /* I - String from config file */
                  mask + 3) != 4)
         return (0);
 
-      mask[3] |= (((((unsigned)mask[0] << 8) | (unsigned)mask[1]) << 8) |
-                  (unsigned)mask[2]) << 8;
+      mask[3] |= ((unsigned)mask[0] << 24) | ((unsigned)mask[1] << 16) |
+                 ((unsigned)mask[2] << 8);
       mask[0] = mask[1] = mask[2] = 0;
     }
     else

diff --git a/scheduler/type.c b/scheduler/type.c
index 5e8879fc264294932b6f4d024e0c657d2df4e896..94461ec7eebcdba4e19d216fa999a4a498b50ecb 100644 (file)
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -1140,7 +1140,7 @@ mime_check_rules(
          else
          {
            bufptr = fb->buffer + rules->offset - fb->offset;
-           intv   = (unsigned)((((((bufptr[0] << 8) | bufptr[1]) << 8) | bufptr[2]) << 8) | bufptr[3]);
+           intv   = (unsigned)((bufptr[0] << 24) | (bufptr[1] << 16) | (bufptr[2] << 8) | bufptr[3]);
            result = (intv == rules->value.intv);
          }
          break;