dlls/shell32/recyclebin.c simplifications

Gerald Pfeifer gerald at pfeifer.com
Thu Nov 1 11:58:32 CDT 2007


In all these cases, iColumn is actually of type unsigned, so checking
for <0 will always give falsity.

Gerald

ChangeLog:
Avoid checking for <0 for unsigned variables.

Index: dlls/shell32/recyclebin.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/recyclebin.c,v
retrieving revision 1.5
diff -u -3 -p -r1.5 recyclebin.c
--- dlls/shell32/recyclebin.c	11 Jun 2007 13:47:57 -0000	1.5
+++ dlls/shell32/recyclebin.c	1 Nov 2007 16:56:54 -0000
@@ -381,7 +381,7 @@ static HRESULT WINAPI RecycleBin_GetDefa
 {
     RecycleBin *This = (RecycleBin *)iface;
     TRACE("(%p, %d, %p)\n", This, iColumn, pcsFlags);
-    if (iColumn < 0 || iColumn >= COLUMNS_COUNT)
+    if (iColumn >= COLUMNS_COUNT)
         return E_INVALIDARG;
     *pcsFlags = RecycleBinColumns[iColumn].pcsFlags;
     return S_OK;
@@ -400,7 +400,7 @@ static HRESULT WINAPI RecycleBin_GetDeta
     WCHAR buffer[MAX_PATH];
 
     TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, pDetails);
-    if (iColumn < 0 || iColumn >= COLUMNS_COUNT)
+    if (iColumn >= COLUMNS_COUNT)
         return E_FAIL;
     pDetails->fmt = RecycleBinColumns[iColumn].fmt;
     pDetails->cxChar = RecycleBinColumns[iColumn].cxChars;
@@ -447,7 +447,7 @@ static HRESULT WINAPI RecycleBin_MapColu
 {
     RecycleBin *This = (RecycleBin *)iface;
     TRACE("(%p, %d, %p)\n", This, iColumn, pscid);
-    if (iColumn<0 || iColumn>=COLUMNS_COUNT)
+    if (iColumn>=COLUMNS_COUNT)
         return E_INVALIDARG;
     pscid->fmtid = *RecycleBinColumns[iColumn].fmtId;
     pscid->pid = RecycleBinColumns[iColumn].pid;



More information about the wine-patches mailing list