Changeset 3546 for trunk/kStuff/include

Timestamp:

Aug 25, 2007, 7:28:50 PM (18 years ago)

Author:

bird

Message:

use .cpp. some string fixes.

Location:

trunk/kStuff/include/k

Files:

• kHlpString.h (modified) (3 diffs)
• kRdr.h (modified) (4 diffs)
• kRdrAll.h (modified) (2 diffs)

trunk/kStuff/include/k/kHlpString.h

@@ -28 +28 @@
 #define ___k_kHlpString_h___
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#if 0 /* optimize / fix this later */
 #ifdef __GNUC__
 /** memchr */
@@ -65 +62 @@
 # error "Port Me"
 #endif
+#endif /* disabled */
 
 #ifdef __cplusplus
@@ -77 +75 @@
 #endif
 #ifndef kHlpMemCopy
-void   *kHlpMemMopy(void *pv1, const void *pv2, KSIZE cb);
+void   *kHlpMemCopy(void *pv1, const void *pv2, KSIZE cb);
 #endif
 #ifndef kHlpMemMove

trunk/kStuff/include/k/kRdr.h

@@ -31 +31 @@
 #include <k/kTypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 /** @defgroup grp_kRdr      kRdr - The File Provider
  * @{ */
@@ -43 +38 @@
 /** Pointer to a file provider instance pointer. */
 typedef struct KRDR **PPKRDR;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int     kRdrOpen(PPKRDR ppRdr, const char *pszFilename);
@@ -56 +55 @@
 KSIZE   kRdrPageSize(PKRDR pRdr);
 #ifndef ___k_kLdr___
-int     kRdrMap(     PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
+int     kRdrMap(     PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
 int     kRdrRefresh( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-int     kRdrProtect( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
+int     kRdrProtect( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect);
 int     kRdrUnmap(   PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
 #endif /* !___k_kLdr___ */
 void    kRdrDone(    PKRDR pRdr);
-
-/** @} */
 
 #ifdef __cplusplus
@@ -69 +66 @@
 #endif
 
+/** @} */
+
 #endif
 

trunk/kStuff/include/k/kRdrAll.h

@@ -67 +67 @@
     int     (* pfnDestroy)( PKRDR pRdr);
     /** @copydoc kRdrRead */
-    int     (* pfnRead)(    PKRDR pRdr, void *pvBuf, size_t cb, KFOFF off);
+    int     (* pfnRead)(    PKRDR pRdr, void *pvBuf, KSIZE cb, KFOFF off);
     /** @copydoc kRdrAllMap */
     int     (* pfnAllMap)(  PKRDR pRdr, const void **ppvBits);
@@ -83 +83 @@
     KSIZE   (* pfnPageSize)(PKRDR pRdr);
     /** @copydoc kRdrMap */
-    int     (* pfnMap)(     PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
+    int     (* pfnMap)(     PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
     /** @copydoc kRdrRefresh */
     int     (* pfnRefresh)( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
     /** @copydoc kRdrProtect */
-    int     (* pfnProtect)( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
+    int     (* pfnProtect)( PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect);
     /** @copydoc kRdrUnmap */
     int     (* pfnUnmap)(   PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);