Changeset 3567 for trunk/kStuff/kLdr/kLdrHlp.h

Timestamp:

Aug 27, 2007, 9:54:05 PM (18 years ago)

Author:

bird

Message:

Use the new type system.

File:

• trunk/kStuff/kLdr/kLdrHlp.h (modified) (5 diffs)

trunk/kStuff/kLdr/kLdrHlp.h

@@ -105 +105 @@
 # endif
 # ifdef kLdrHlpStrChr_needed
-int     kLdrHlpStrNComp(const char *psz1, const char *psz2, size_t cch);
+int     kLdrHlpStrNComp(const char *psz1, const char *psz2, KSIZE cch);
 # endif
 # ifdef kLdrHlpMemChr_needed
-void   *kLdrHlpMemChr(const void *pv, int ch, size_t cb);
+void   *kLdrHlpMemChr(const void *pv, int ch, KSIZE cb);
 # endif
 # ifdef kLdrHlpMemMove_needed
-void   *kLdrHlpMemMove(void *pv1, const void *pv2, size_t cb);
+void   *kLdrHlpMemMove(void *pv1, const void *pv2, KSIZE cb);
 # endif
 
@@ -169 +169 @@
 #endif
 
-size_t  kLdrHlpStrNLen(const char *psz, size_t cchMax);
-int     kLdrHlpMemIComp(const void *pv1, const void *pv2, size_t cb);
+KSIZE   kLdrHlpStrNLen(const char *psz, KSIZE cchMax);
+int     kLdrHlpMemIComp(const void *pv1, const void *pv2, KSIZE cb);
 int     kLdrHlpStrIComp(const char *pv1, const char *pv2);
 
@@ -178 +178 @@
 void    kldrHlpSemRelease(void);
 
-int     kldrHlpPageAlloc(void **ppv, size_t cb, KLDRPROT enmProt, unsigned fFixed);
-int     kldrHlpPageProtect(void *pv, size_t cb, KLDRPROT enmProt);
-int     kldrHlpPageFree(void *pv, size_t cb);
+int     kldrHlpPageAlloc(void **ppv, KSIZE cb, KLDRPROT enmProt, unsigned fFixed);
+int     kldrHlpPageProtect(void *pv, KSIZE cb, KLDRPROT enmProt);
+int     kldrHlpPageFree(void *pv, KSIZE cb);
 
 int     kldrHlpHeapInit(void);
 void    kldrHlpHeapTerm(void);
-void    kldrHlpHeapDonate(void *pv, size_t cb);
-void *  kldrHlpAlloc(size_t cb);
-void *  kldrHlpAllocZ(size_t cb);
+void    kldrHlpHeapDonate(void *pv, KSIZE cb);
+void *  kldrHlpAlloc(KSIZE cb);
+void *  kldrHlpAllocZ(KSIZE cb);
 void    kldrHlpFree(void *pv);
 
-int     kldrHlpGetEnv(const char *pszVar, char *pszVal, size_t cchVal);
-int     kldrHlpGetEnvUZ(const char *pszVar, size_t *pcb);
+int     kldrHlpGetEnv(const char *pszVar, char *pszVal, KSIZE cchVal);
+int     kldrHlpGetEnvUZ(const char *pszVar, KSIZE *pcb);
 char   *kldrHlpGetFilename(const char *pszFilename);
 char   *kldrHlpGetSuff(const char *pszFilename);
@@ -197 +197 @@
 void    kldrHlpExit(int rc);
 void    kldrHlpSleep(unsigned cMillies);
-char   *kldrHlpInt2Ascii(char *psz, size_t cch, long lVal, unsigned iBase);
+char   *kldrHlpInt2Ascii(char *psz, KSIZE cch, long lVal, unsigned iBase);
 void    kldrHlpAssertMsg(const char *pszExpr, const char *pszFile, unsigned iLine, const char *pszFunction);
 
@@ -233 +233 @@
         if ((cb)) \
         { \
-            uint8_t             __b; \
-            uint8_t volatile *  __pb = (uint8_t volatile *)(buf); \
-            size_t              __cbPage1 = 0x1000 - ((uintptr_t)(__pb) & 0xfff); /* ASSUMES page size! */ \
+            KU8             __b; \
+            KU8 volatile *  __pb = (KU8 volatile *)(buf); \
+            KSIZE           __cbPage1 = 0x1000 - ((KUPTR)(__pb) & 0xfff); /* ASSUMES page size! */ \
             __b = *__pb; *__pb = 0xff; *__pb = __b; \
             if ((cb) > __cbPage1) \
             { \
-                size_t  __cb = (cb) - __cbPage1; \
+                KSIZE   __cb = (cb) - __cbPage1; \
                 __pb -= __cbPage1; \
                 for (;;) \