Changeset 238 for trunk/src/helpers/dosh.c

Timestamp:

Dec 24, 2002, 8:44:35 AM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

File:

• trunk/src/helpers/dosh.c (modified) (15 diffs)

trunk/src/helpers/dosh.c

@@ -196 +196 @@
               0);
 
-    return (kki.chChar);
+    return kki.chChar;
 }
 
@@ -286 +286 @@
     }
 
-    return (s_ulrc);
+    return s_ulrc;
 }
 
@@ -353 +353 @@
                     &ulms,
                     sizeof(ulms));
-    return (ulms);
+    return ulms;
 }
 
@@ -375 +375 @@
                     ULONG cbData)
 {
-    return (DosDevIOCtl(hf,
-                        ulCategory,
-                        ulFunction,
-                        pvParams, cbParams, &cbParams,
-                        pvData, cbData, &cbData));
+    return DosDevIOCtl(hf,
+                       ulCategory,
+                       ulFunction,
+                       pvParams, cbParams, &cbParams,
+                       pvData, cbData, &cbData);
 }
 
@@ -409 +409 @@
         *parc = ERROR_NOT_ENOUGH_MEMORY;
 
-    return (pv);
+    return pv;
 }
 
@@ -467 +467 @@
 {
     PVOID   pvrc = NULL;
-    APIRET  arc = DosAllocSharedMem((PVOID*)&pvrc,
-                                    (PSZ)pcszName,
-                                    ulSize,
-                                    PAG_COMMIT | PAG_READ | PAG_WRITE);
-    if (arc == NO_ERROR)
-        return (pvrc);
+
+    if (!DosAllocSharedMem((PVOID*)&pvrc,
+                           (PSZ)pcszName,
+                           ulSize,
+                           PAG_COMMIT | PAG_READ | PAG_WRITE))
+        return pvrc;
 
     return NULL;
@@ -494 +494 @@
 {
     PVOID pvrc = NULL;
-    APIRET arc = DosGetNamedSharedMem((PVOID*)pvrc,
-                                      (PSZ)pcszName,
-                                      PAG_READ | PAG_WRITE);
-    if (arc == NO_ERROR)
-        return (pvrc);
+
+    if (!DosGetNamedSharedMem((PVOID*)pvrc,
+                              (PSZ)pcszName,
+                              PAG_READ | PAG_WRITE))
+        return pvrc;
 
     return NULL;
@@ -1977 +1977 @@
         strcpy(FSInfoBuf.szVolLabel, pszNewLabel);
 
-        return (DosSetFSInfo(ulLogicalDrive,
-                             FSIL_VOLSER,
-                             &FSInfoBuf,
-                             sizeof(FSInfoBuf)));
-    }
-    else
-        return (ERROR_LABEL_TOO_LONG);
+        return DosSetFSInfo(ulLogicalDrive,
+                            FSIL_VOLSER,
+                            &FSInfoBuf,
+                            sizeof(FSInfoBuf));
+    }
+
+    return ERROR_LABEL_TOO_LONG;
 }
 
@@ -2169 +2169 @@
     }
 
-    return (pReturn);
+    return pReturn;
 }
 
@@ -3300 +3300 @@
     } while (!doshQueryPathSize(szFilename, &ulDummy));
 
-    return (strdup(szFilename));
+    return strdup(szFilename);
 }
 
@@ -3573 +3573 @@
         // file found:
         return ((fs3.attrFile & FILE_DIRECTORY) != 0);
-    else
-        return FALSE;
+
+    return FALSE;
 }
 
@@ -3636 +3636 @@
     }
 
-    return (arc0);
+    return arc0;
 }
 
@@ -3785 +3785 @@
         arcReturn = DosDeleteDir((PSZ)pcszDir);
 
-    return (arcReturn);
+    return arcReturn;
 }
 
@@ -4324 +4324 @@
 
     // PID is at offset 0 in the local info seg
-    return (*(PUSHORT)G_pvLocalInfoSeg);
+    return *(PUSHORT)G_pvLocalInfoSeg;
 }
 
@@ -4344 +4344 @@
 
     // TID is at offset 6 in the local info seg
-    return (*(PUSHORT)((PBYTE)G_pvLocalInfoSeg + 6));
+    return *(PUSHORT)((PBYTE)G_pvLocalInfoSeg + 6);
 }