Changeset 3573 for trunk/kStuff/kLdr/kLdrModNative.c

Timestamp:

Aug 31, 2007, 6:09:23 AM (18 years ago)

Author:

bird

Message:

kHlp work...

File:

• trunk/kStuff/kLdr/kLdrModNative.c (modified) (8 diffs)

trunk/kStuff/kLdr/kLdrModNative.c

@@ -30 +30 @@
 *******************************************************************************/
 #include <k/kLdr.h>
-#include "kLdrHlp.h"
 #include "kLdrInternal.h"
 #ifdef __OS2__
@@ -81 +80 @@
  */
 #ifdef KLDRMODNATIVE_STRICT
-# define KLDRMODNATIVE_ASSERT(expr)  kldrHlpAssert(expr)
+# define KLDRMODNATIVE_ASSERT(expr)  kHlpAssert(expr)
 #else
 # define KLDRMODNATIVE_ASSERT(expr)  do {} while (0)
@@ -300 +299 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kLdrHlpStrLen(szFilename);
+    cchFilename = kHlpStrLen(szFilename);
     cb = K_ALIGN_Z(sizeof(KLDRMODNATIVE), 16)
        + K_OFFSETOF(KLDRMOD, aSegments[cSegments])
        + cchFilename + 1;
-    pModNative = (PKLDRMODNATIVE)kldrHlpAlloc(cb);
+    pModNative = (PKLDRMODNATIVE)kHlpAlloc(cb);
     if (!pModNative)
         return KLDR_ERR_NO_MEMORY;
@@ -316 +315 @@
     pMod->cchFilename = cchFilename;
     pMod->pszFilename = (char *)&pMod->aSegments[pMod->cSegments];
-    kLdrHlpMemCopy((char *)pMod->pszFilename, szFilename, cchFilename + 1);
-    pMod->pszName = kldrHlpGetFilename(pMod->pszFilename); /** @todo get soname */
+    kHlpMemCopy((char *)pMod->pszFilename, szFilename, cchFilename + 1);
+    pMod->pszName = kHlpGetFilename(pMod->pszFilename); /** @todo get soname */
     pMod->cchName = cchFilename - (pMod->pszName - pMod->pszFilename);
 #if defined(__i386__) || defined(__X86__) || defined(_M_IX86)
@@ -492 +491 @@
             case IMAGE_SCN_ALIGN_4096BYTES:     pMod->aSegments[i + 1].Alignment = 4096; break;
             case IMAGE_SCN_ALIGN_8192BYTES:     pMod->aSegments[i + 1].Alignment = 8192; break;
-            default: kldrHlpAssert(0);          pMod->aSegments[i + 1].Alignment = 0; break;
+            default: kHlpAssert(0);          pMod->aSegments[i + 1].Alignment = 0; break;
         }
     }
@@ -535 +534 @@
     pMod->u32Magic = 0;
     pMod->pOps = NULL;
-    kldrHlpFree(pModNative);
+    kHlpFree(pModNative);
     return rc;
 }
@@ -561 +560 @@
     if (pszSymbol && pszSymbol[cchSymbol])
     {
-        char *pszCopy = kLdrHlpAllocA(cchSymbol + 1);
-        kLdrHlpMemCopy(pszCopy, pchSymbol, cchSymbol);
+        char *pszCopy = kHlpAllocA(cchSymbol + 1);
+        kHlpMemCopy(pszCopy, pchSymbol, cchSymbol);
         pszCopy[cchSymbol] = '\0';
         pszSymbol = pszCopy;
@@ -756 +755 @@
                                       const IMAGE_IMPORT_DESCRIPTOR *);
     pszImportName = KLDRMODNATIVE_RVA2TYPE(pModNative->hmod, pImpDesc->Name, const char *);
-    cchImportName = kLdrHlpStrLen(pszImportName);
+    cchImportName = kHlpStrLen(pszImportName);
     if (cchImportName < cchName)
     {
-        kLdrHlpMemCopy(pszName, pszImportName, cchImportName + 1);
+        kHlpMemCopy(pszName, pszImportName, cchImportName + 1);
         rc = 0;
     }
     else
     {
-        kLdrHlpMemCopy(pszName, pszImportName, cchName);
+        kHlpMemCopy(pszName, pszImportName, cchName);
         if (cchName)
             pszName[cchName - 1] = '\0';