Merge pull request #609 from AtariDreams/redundant

Remove redundant checks
OpenPrinting · Feb 3, 2023 · 6885402 · 6885402
2 parents a6d91a2 + 16a8f18
commit 6885402
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
@@ -1809,8 +1809,7 @@ static CFStringRef copy_printer_interface_indexed_description(printer_interface_
 	if (description[1] != kUSBStringDesc)
 		return NULL;
 
-	if ((description[0] & 1) != 0)
-		description[0] &= ~1;
+	description[0] &= ~1;
 
 	if (description[0] < 2)
 		return CFSTR("");

diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
@@ -793,7 +793,7 @@ httpCredentialsString(
   if (!buffer)
     return (0);
 
-  if (buffer && bufsize > 0)
+  if (bufsize > 0)
     *buffer = '\0';
 
   if ((first = (http_credential_t *)cupsArrayFirst(credentials)) != NULL &&

diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c
@@ -324,7 +324,7 @@ httpCredentialsString(
   if (!buffer)
     return (0);
 
-  if (buffer && bufsize > 0)
+  if (bufsize > 0)
     *buffer = '\0';
 
   cert = http_sspi_create_credential(first);

diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
@@ -462,11 +462,10 @@ CompressData(const unsigned char *line,	/* I - Data to compress */
       *comp_ptr++ = temp;
 
      /*
-      * Check the last bit in the current byte and the first bit in the
-      * next byte...
+      * Check the last bit in the current byte...
       */
 
-      if ((temp & 0x01) && comp_ptr < line_end && *comp_ptr & 0x80)
+      if ((temp & 0x01) && comp_ptr < line_end)
         *comp_ptr &= 0x7f;
     }
   }

diff --git a/scheduler/type.c b/scheduler/type.c
@@ -221,7 +221,7 @@ mimeAddTypeRule(mime_type_t *mt,	/* I - Type to add to */
     else if (*rule == '+' && current != NULL)
     {
       if (logic != MIME_MAGIC_AND &&
-          current != NULL && current->prev != NULL)
+          current->prev != NULL)
       {
        /*
         * OK, we have more than 1 rule in the current tree level...  Make a