Changeset 3578 for trunk/kStuff/kLdr/kLdrMod.c

Timestamp:

Sep 2, 2007, 10:55:51 PM (18 years ago)

Author:

bird

Message:

kLdrRdr cleanup.

File:

• trunk/kStuff/kLdr/kLdrMod.c (modified) (4 diffs)

trunk/kStuff/kLdr/kLdrMod.c

@@ -111 +111 @@
      * Open the file using a bit provider.
      */
-    PKLDRRDR pRdr;
-    int rc = kLdrRdrOpen(&pRdr, pszFilename);
+    PKRDR pRdr;
+    int rc = kRdrOpen(&pRdr, pszFilename);
     if (!rc)
     {
@@ -118 +118 @@
         if (!rc)
             return 0;
-       kLdrRdrClose(pRdr);
+       kRdrClose(pRdr);
     }
     return rc;
@@ -135 +135 @@
  * @param   ppMod           Where to store the module handle.
  */
-int kLdrModOpenFromRdr(PKLDRRDR pRdr, PPKLDRMOD ppMod)
+int kLdrModOpenFromRdr(PKRDR pRdr, PPKLDRMOD ppMod)
 {
     union
@@ -151 +151 @@
      * Always read the 'new header' if we encounter MZ.
      */
-    rc = kLdrRdrRead(pRdr, &u, sizeof(u), 0);
+    rc = kRdrRead(pRdr, &u, sizeof(u), 0);
     if (rc)
         return rc;
     if (    u.u16 == IMAGE_DOS_SIGNATURE
-        &&  kLdrRdrSize(pRdr) > sizeof(IMAGE_DOS_HEADER))
+        &&  kRdrSize(pRdr) > sizeof(IMAGE_DOS_HEADER))
     {
-        rc = kLdrRdrRead(pRdr, &u, sizeof(u.u32), K_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew));
+        rc = kRdrRead(pRdr, &u, sizeof(u.u32), K_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew));
         if (rc)
             return rc;
-        if ((KLDRFOFF)u.u32 < kLdrRdrSize(pRdr))
+        if ((KLDRFOFF)u.u32 < kRdrSize(pRdr))
         {
             offHdr = u.u32;
-            rc = kLdrRdrRead(pRdr, &u, sizeof(u.u32), offHdr);
+            rc = kRdrRead(pRdr, &u, sizeof(u.u32), offHdr);
             if (rc)
                 return rc;