diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index a414050828..a4cd25dcb7 100644 --- 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 index 869e94db9d..002236a3b1 100644 --- 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 index 14f1a084a1..f925122f27 100644 --- 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 index c815691dc7..b9cfa548e9 100644 --- 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 index 731514c07f..c6c531022b 100644 --- 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