[PATCH] sane.ds: Removed 3 array != NULL checks (Coverity)
Marcus Meissner
marcus at jet.franken.de
Thu Jun 16 11:40:39 CDT 2011
Hi,
CID 4882.
Ciao, Marcus
---
dlls/sane.ds/sane_main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c
index 13422bb..f482098 100644
--- a/dlls/sane.ds/sane_main.c
+++ b/dlls/sane.ds/sane_main.c
@@ -473,13 +473,13 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) {
/* To make string as short as above */
lstrcpynA(name, sane_devlist[i]->vendor, sizeof(name)-1);
- if (self->Manufacturer && *self->Manufacturer && strcmp(name, self->Manufacturer))
+ if (*self->Manufacturer && strcmp(name, self->Manufacturer))
continue;
lstrcpynA(name, sane_devlist[i]->model, sizeof(name)-1);
- if (self->ProductFamily && *self->ProductFamily && strcmp(name, self->ProductFamily))
+ if (*self->ProductFamily && strcmp(name, self->ProductFamily))
continue;
copy_sane_short_name(sane_devlist[i]->name, name, sizeof(name) - 1);
- if (self->ProductName && *self->ProductName && strcmp(name, self->ProductName))
+ if (*self->ProductName && strcmp(name, self->ProductName))
continue;
break;
}
--
1.7.3.4
More information about the wine-patches
mailing list