From 12d046d024927b6a17e0ba914800a2cbafbac5f8 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 16 Jul 2019 20:27:08 +0200 Subject: [PATCH] PVS V547: always false conditions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I389c081331b1c5ef67bef9ffcac9055573e1ebf5 Reviewed-on: https://review.haiku-os.org/c/1605 Reviewed-by: Stephan Aßmus --- headers/os/drivers/USB_spec.h | 2 ++ src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp | 2 +- src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp | 2 +- src/add-ons/kernel/bus_managers/scsi/busses.cpp | 1 + src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.cpp | 4 ++-- .../kernel/drivers/network/usb_davicom/DavicomDevice.cpp | 4 ++-- .../kernel/drivers/power/acpi_battery/acpi_battery.cpp | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/headers/os/drivers/USB_spec.h b/headers/os/drivers/USB_spec.h index 9b94857370..0bb68dc945 100644 --- a/headers/os/drivers/USB_spec.h +++ b/headers/os/drivers/USB_spec.h @@ -75,8 +75,10 @@ #define USB_ENDPOINT_ATTR_IMPLICIT_USAGE 0x20 #define USB_ENDPOINT_ATTR_USAGE_MASK 0x30 +/* Direction */ #define USB_ENDPOINT_ADDR_DIR_IN 0x80 #define USB_ENDPOINT_ADDR_DIR_OUT 0x00 +#define USB_ENDPOINT_ADDR_DIR_MASK 0x80 typedef struct usb_device_descriptor { diff --git a/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp b/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp index 4d39d1439c..88c8b99fda 100644 --- a/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp +++ b/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp @@ -1154,7 +1154,7 @@ bind_aperture(aperture_id id, area_id area, addr_t base, size_t size, status_t status = aperture->BindMemory(memory, base, size); if (status < B_OK) { - if (reservedBase < 0) + if (reservedBase != 0) aperture->DeleteMemory(memory); return status; diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp index 700aba4696..b6b254c219 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp @@ -183,7 +183,7 @@ get_elantech_movement(elantech_cookie *cookie, mouse_movement *movement) dprintf("ELANTECH: Fingers %d, raw %x (MOTION)\n", (packet[3] & 0xe0) >>5, packet[3]); //Most likely palm if (cookie->fingers == 0) return B_OK; //handle overflow and delta values - if ((packet[0] & 0x10) == 1) { + if ((packet[0] & 0x10) != 0) { event.xPosition = cookie->x += 5 * (int8)packet[1]; event.yPosition = cookie->y += 5 * (int8)packet[2]; } else { diff --git a/src/add-ons/kernel/bus_managers/scsi/busses.cpp b/src/add-ons/kernel/bus_managers/scsi/busses.cpp index 934cf3215e..0de3701b04 100644 --- a/src/add-ons/kernel/bus_managers/scsi/busses.cpp +++ b/src/add-ons/kernel/bus_managers/scsi/busses.cpp @@ -133,6 +133,7 @@ scsi_create_bus(device_node *node, uint8 path_id) } res = INIT_BEN(&bus->mutex, "scsi_bus_mutex"); + if (res < B_OK) goto err3; diff --git a/src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.cpp b/src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.cpp index 0590d59383..4f43550461 100644 --- a/src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.cpp +++ b/src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.cpp @@ -493,13 +493,13 @@ ASIXDevice::_SetupEndpoints() continue; } - if ((epd->endpoint_address & USB_ENDPOINT_ADDR_DIR_IN) + if ((epd->endpoint_address & USB_ENDPOINT_ADDR_DIR_MASK) == USB_ENDPOINT_ADDR_DIR_IN) { readEndpoint = ep; continue; } - if ((epd->endpoint_address & USB_ENDPOINT_ADDR_DIR_OUT) + if ((epd->endpoint_address & USB_ENDPOINT_ADDR_DIR_MASK) == USB_ENDPOINT_ADDR_DIR_OUT) { writeEndpoint = ep; continue; diff --git a/src/add-ons/kernel/drivers/network/usb_davicom/DavicomDevice.cpp b/src/add-ons/kernel/drivers/network/usb_davicom/DavicomDevice.cpp index 9ceb5f987a..3d492728ff 100644 --- a/src/add-ons/kernel/drivers/network/usb_davicom/DavicomDevice.cpp +++ b/src/add-ons/kernel/drivers/network/usb_davicom/DavicomDevice.cpp @@ -577,14 +577,14 @@ DavicomDevice::_SetupEndpoints() continue; } - if ((epd->endpoint_address & USB_ENDPOINT_ADDR_DIR_IN) + if ((epd->endpoint_address & USB_ENDPOINT_ADDR_DIR_MASK) == USB_ENDPOINT_ADDR_DIR_IN) { readEndpoint = ep; continue; } - if ((epd->endpoint_address & USB_ENDPOINT_ADDR_DIR_OUT) + if ((epd->endpoint_address & USB_ENDPOINT_ADDR_DIR_MASK) == USB_ENDPOINT_ADDR_DIR_OUT) { writeEndpoint = ep; diff --git a/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp b/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp index 83f8fc371f..18bbf3a2bf 100644 --- a/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp +++ b/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp @@ -325,7 +325,7 @@ acpi_battery_read(void* _cookie, off_t position, void *buffer, size_t* numBytes) if (position == 0) { char string[512]; char *str = string; - size_t max_len = sizeof(string); + ssize_t max_len = sizeof(string); snprintf(str, max_len, "Battery Status:\n"); max_len -= strlen(str); str += strlen(str);