Changeset 3548

Timestamp:

Aug 26, 2007, 12:06:53 AM (18 years ago)

Author:

bird

Message:

kRdrBuf - a buffered kRdr wrapper.

Location:

trunk/kStuff

Files:

• include/k/kErrors.h (modified) (3 diffs)
• include/k/kRdr.h (modified) (2 diffs)
• kRdr/Makefile.kmk (modified) (1 diff)
• kRdr/kRdrBuffered.cpp (added)
• kRdr/kRdrInternal.h (modified) (1 diff)

trunk/kStuff/include/k/kErrors.h

@@ -74 +74 @@
 /** The specified file was not found. */
 #define KERR_FILE_NOT_FOUND                             (KERR_FILE_SYSTEM_AND_IO_BASE + 0)
+/** End of file. */
+#define KERR_EOF                                        (KERR_FILE_SYSTEM_AND_IO_BASE + 1)
 /** @} */
 
@@ -80 +82 @@
  * @{ */
 /** The base of the kDbg specific status codes. */
-#define KDBG_ERR_BASE                                   (KERR_FILE_SYSTEM_AND_IO_BASE + 1)
+#define KDBG_ERR_BASE                                   (KERR_FILE_SYSTEM_AND_IO_BASE + 2)
 /** The (module) format isn't known to use. */
 #define KDBG_ERR_UNKOWN_FORMAT                          (KDBG_ERR_BASE + 0)
@@ -96 +98 @@
 #define KRDR_ERR_BASE                                   (KDBG_ERR_BASE + 4)
 /** The file reader can't take more concurrent mappings. */
-#define KRDR_ERR_TOO_MANY_MAPPINGS                      (KRDR_ERR_BASE + 59)
+#define KRDR_ERR_TOO_MANY_MAPPINGS                      (KRDR_ERR_BASE + 0)
+/** The pRdr instance passed to a kRdrBuf* API isn't a buffered instance. */
+#define KRDR_ERR_NOT_BUFFERED_RDR                       (KRDR_ERR_BASE + 1)
+/** The line is too long to fit in the buffer passed to kRdrBufLine or kRdrBufLineEx. */
+#define KRDR_ERR_LINE_TOO_LONG                          (KRDR_ERR_BASE + 2)
 /** @} */
 

trunk/kStuff/include/k/kRdr.h

@@ -34 +34 @@
  * @{ */
 
+/** @def KRDR_DECL
+ * Declares a kRdr function according to build context.
+ * @param type          The return type.
+ */
+#if defined(KRDR_BUILDING_DYNAMIC)
+# define KRDR_DECL(type)    K_DECL_EXPORT(type)
+#elif defined(KRDR_BUILT_DYNAMIC)
+# define KRDR_DECL(type)    K_DECL_IMPORT(type)
+#else
+# define KRDR_DECL(type)    type
+#endif
+
 /** Pointer to a file provider instance. */
 typedef struct KRDR *PKRDR;
@@ -43 +55 @@
 #endif
 
-int     kRdrOpen(PPKRDR ppRdr, const char *pszFilename);
-int     kRdrOpenBuffered(PPKRDR ppRdr, const char *pszFilename);
-int     kRdrClose(   PKRDR pRdr);
-int     kRdrRead(    PKRDR pRdr, void *pvBuf, KSIZE cb, KFOFF off);
-int     kRdrAllMap(  PKRDR pRdr, const void **ppvBits);
-int     kRdrAllUnmap(PKRDR pRdr, const void *pvBits);
-KFOFF   kRdrSize(    PKRDR pRdr);
-KFOFF   kRdrTell(    PKRDR pRdr);
-const char *kRdrName(PKRDR pRdr);
-KIPTR   kRdrNativeFH(PKRDR pRdr);
-KSIZE   kRdrPageSize(PKRDR pRdr);
+KRDR_DECL(int)      kRdrOpen(   PPKRDR ppRdr, const char *pszFilename);
+KRDR_DECL(int)      kRdrClose(    PKRDR pRdr);
+KRDR_DECL(int)      kRdrRead(     PKRDR pRdr, void *pvBuf, KSIZE cb, KFOFF off);
+KRDR_DECL(int)      kRdrAllMap(   PKRDR pRdr, const void **ppvBits);
+KRDR_DECL(int)      kRdrAllUnmap( PKRDR pRdr, const void *pvBits);
+KRDR_DECL(KFOFF)    kRdrSize(     PKRDR pRdr);
+KRDR_DECL(KFOFF)    kRdrTell(     PKRDR pRdr);
+KRDR_DECL(const char *) kRdrName( PKRDR pRdr);
+KRDR_DECL(KIPTR)    kRdrNativeFH( PKRDR pRdr);
+KRDR_DECL(KSIZE)    kRdrPageSize( PKRDR pRdr);
 #ifndef ___k_kLdr___
-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, KBOOL fUnprotectOrProtect);
-int     kRdrUnmap(   PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
+KRDR_DECL(int)      kRdrMap(      PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
+KRDR_DECL(int)      kRdrRefresh(  PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
+KRDR_DECL(int)      kRdrProtect(  PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fUnprotectOrProtect);
+KRDR_DECL(int)      kRdrUnmap(    PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
 #endif /* !___k_kLdr___ */
-void    kRdrDone(    PKRDR pRdr);
+KRDR_DECL(void)     kRdrDone(PKRDR pRdr);
+
+KRDR_DECL(int)      kRdrBufOpen(PPKRDR ppRdr, const char *pszFilename);
+KRDR_DECL(int)      kRdrBufWrap(PPKRDR ppRdr, PKRDR pRdr);
+KRDR_DECL(int)      kRdrBufLine(  PKRDR pRdr, char *pszLine, KSIZE cbLine);
+KRDR_DECL(int)      kRdrBufLineEx(PKRDR pRdr, char *pszLine, KSIZE *pcbLine);
+KRDR_DECL(const char *) kRdrBufLineQ(PKRDR pRdr);
 
 #ifdef __cplusplus

trunk/kStuff/kRdr/Makefile.kmk

@@ -37 +37 @@
 kRdrStatic_SOURCES = \
         kRdr.cpp \
-        kRdrFile.cpp
+        kRdrFile.cpp \
+        kRdrBuffered.cpp
 
 # Generate the rules

trunk/kStuff/kRdr/kRdrInternal.h

@@ -93 +93 @@
 #define KRDR_VALIDATE_VOID(pRdr) \
     do  { \
-        if (    (pRdr)->u32Magic != KRDR_MAGIC \
+        if (    !K_VALID_PTR(pRdr) \
+            ||  (pRdr)->u32Magic != KRDR_MAGIC \
             ||  (pRdr)->pOps == NULL \
            )\