Changeset 2883 for trunk/kLdr/kLdrHlp.c

Timestamp:

Nov 18, 2006, 12:21:33 PM (19 years ago)

Author:

bird

Message:

cleanup.

File:

• trunk/kLdr/kLdrHlp.c (modified) (6 diffs)

trunk/kLdr/kLdrHlp.c

@@ -96 +96 @@
 {
 #ifdef __OS2__
-    APIRET rc;
     HMTX hmtx = g_hmtx;
     g_hmtx = NULLHANDLE;
-    rc = DosCloseMutexSem(hmtx);
-    if (rc)
-        return rc;
+    DosCloseMutexSem(hmtx);
 
 #elif defined(__WIN__)
@@ -267 +264 @@
 #ifdef __OS2__
     APIRET      rc;
-    uintptr_t   offStub;
     ULONG       fFlags = kldrHlpPageProtToNative(enmProt);;
 
@@ -329 +325 @@
     {
         /* decommit the pages in the stub. */
-        size_t cbSub = KLDR_MIN(g_cbStub - offStub, cb);
+        size_t cbStub = KLDR_MIN(g_cbStub - offStub, cb);
         rc = DosSetMem(pv, cbStub, PAG_DECOMMIT);
         if (rc)
         {
             /* Page by page, ignoring errors after the first success. */
-            while (cbSub > 0)
+            while (cbStub > 0)
             {
                 if (!DosSetMem(pv, 0x1000, PAG_DECOMMIT))
                     rc = 0;
                 pv = (void *)((uintptr_t)pv + 0x1000);
-                cbSub -= 0x1000;
+                cbStub -= 0x1000;
                 cb -= 0x1000;
             }
@@ -350 +346 @@
         else
         {
-            cb -= cbSub;
+            cb -= cbStub;
             if (!cb)
                 return 0;
-            pv = (void *)((uintptr_t)pv + cbSub);
+            pv = (void *)((uintptr_t)pv + cbStub);
         }
     }
@@ -403 +399 @@
     if (!rc)
     {
-        size_t cch = kLdrHlpStrLen(pszValue);
+        size_t cch = kLdrHlpStrLen((const char *)pszValue);
         if (cchVal > cch)
             kLdrHlpMemCopy(pszVal, pszValue, cch + 1);
@@ -592 +588 @@
 int kldrHlpIsFilenameOnly(const char *pszFilename)
 {
-    const char *pszLast = NULL;
     for (;;)
     {