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

Timestamp:

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

Author:

bird

Message:

kHlp work...

File:

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

trunk/kStuff/kLdr/kLdrMod.c

@@ -30 +30 @@
 *******************************************************************************/
 #include <k/kLdr.h>
-#include "kLdrHlp.h"
 #include "kLdrInternal.h"
 #include <k/kLdrFmts/mz.h>
@@ -53 +52 @@
  */
 #ifdef KLDRMOD_STRICT
-# define KLDRMOD_ASSERT(expr)  kldrHlpAssert(expr)
+# define KLDRMOD_ASSERT(expr)  kHlpAssert(expr)
 #else
 # define KLDRMOD_ASSERT(expr)  do {} while (0)
@@ -268 +267 @@
         *puValue = 0;
     if (pfKind)
-        KLDRHLP_VALIDATE_FLAGS(*pfKind, KLDRSYMKIND_REQ_SEGMENTED);
+        K_VALIDATE_FLAGS(*pfKind, KLDRSYMKIND_REQ_SEGMENTED);
     return pMod->pOps->pfnQuerySymbol(pMod, pvBits, BaseAddress, iSymbol, pchSymbol, cchSymbol, pszVersion,
                                       pfnGetForwarder, pvUser, puValue, pfKind);
@@ -292 +291 @@
 {
     KLDRMOD_VALIDATE(pMod);
-    KLDRHLP_VALIDATE_FLAGS(fFlags, KLDRMOD_ENUM_SYMS_FLAGS_ALL);
+    K_VALIDATE_FLAGS(fFlags, KLDRMOD_ENUM_SYMS_FLAGS_ALL);
     return pMod->pOps->pfnEnumSymbols(pMod, pvBits, BaseAddress, fFlags, pfnCallback, pvUser);
 }
@@ -653 +652 @@
 {
     KLDRMOD_VALIDATE(pMod);
-    KLDRHLP_VALIDATE_FLAGS(fAttachingOrDetaching, 1);
+    K_VALIDATE_FLAGS(fAttachingOrDetaching, 1);
     return pMod->pOps->pfnCallThread(pMod, uHandle, fAttachingOrDetaching);
 }