Changeset 3550 for trunk/kStuff/kRdr/kRdrBuffered.cpp

Timestamp:

Aug 26, 2007, 3:13:35 AM (18 years ago)

Author:

bird

Message:

made kDbg compile again (not linking yet though).

File:

• trunk/kStuff/kRdr/kRdrBuffered.cpp (modified) (7 diffs)

trunk/kStuff/kRdr/kRdrBuffered.cpp

@@ -60 +60 @@
     /** The buffer. */
     KU8                *pbBuf;
-    /** Did we open the pRdr instance or was it handed to us? */
-    KBOOL               fOpenedRdr;
+    /** Whether the pRdr instance should be closed together with us or not. */
+    KBOOL               fCloseIt;
     /** Set if the buffer has been messed up by kRdrBufLineQ. */
     KBOOL               fTainedByLineQ;
@@ -354 +354 @@
 
     /* Close the kRdr instance that we're wrapping. */
-    if (pThis->fOpenedRdr)
+    if (pThis->fCloseIt)
     {
         int rc = pThis->pRdr->pOps->pfnDestroy(pThis->pRdr);
         if (rc)
             return rc;
-        pThis->fOpenedRdr = K_FALSE;
+        pThis->fCloseIt = K_FALSE;
         pThis->pRdr = NULL;
     }
@@ -380 +380 @@
  * Worker for kRdrBufOpen and kRdrBufWrap.
  *
- * It's essentially kRdrBufWrap without some error checking and an extra argument.
+ * It's essentially kRdrBufWrap without error checking.
  *
  * @returns 0 on success, one of the kErrors status code on failure.
  * @param   ppRdr           Where to store the new file provider instance.
  * @param   pRdrWrapped     The file provider instance to buffer.
- * @param   fOpenedIt       Whether it was opened or not. If set we'll close
- *                          pRdrWrapped on failure.
- */
-static int krdrBufWrapIt(PPKRDR ppRdr, PKRDR pRdrWrapped, KBOOL fOpenedIt)
+ * @param   fCloseIt        Whether it the pRdrWrapped instance should be closed
+ *                          when the new instance is closed.
+ */
+static int krdrBufWrapIt(PPKRDR ppRdr, PKRDR pRdrWrapped, KBOOL fCloseIt)
 {
     PKRDRBUF pThis = (PKRDRBUF)kHlpAlloc(sizeof(*pThis));
@@ -400 +400 @@
         pThis->offBuf = pThis->offBufEnd = 0;
         pThis->cbBufValid = 0;
-        pThis->fOpenedRdr = fOpenedIt;
+        pThis->fCloseIt = fCloseIt;
         pThis->fTainedByLineQ = K_FALSE;
         if (pThis->cbFile < 128*1024)
@@ -416 +416 @@
         kHlpFree(pThis);
     }
-    if (fOpenedIt)
-        kRdrClose(pRdrWrapped);
     return KERR_NO_MEMORY;
 }
@@ -436 +434 @@
     PKRDR pRdrWrapped;
     int rc = kRdrOpen(&pRdrWrapped, pszFilename);
-    if (rc)
-        return rc;
-
-    return krdrBufWrapIt(ppRdr, pRdrWrapped, K_TRUE);
+    if (!rc)
+    {
+        rc = krdrBufWrapIt(ppRdr, pRdrWrapped, K_TRUE);
+        if (rc)
+            kRdrClose(pRdrWrapped);
+    }
+    return rc;
 }
 
@@ -447 +448 @@
  *
  * @returns 0 on success, KERR_* on failure.
- * @param   ppRdr
- * @param   pRdr
- */
-KRDR_DECL(int) kRdrBufWrap(PPKRDR ppRdr, PKRDR pRdr)
+ * @param   ppRdr           Where to store the new file provider pointer.
+ * @param   pRdr            The file provider instance to wrap.
+ * @param   fCLoseIt        Whether it the wrapped reader should be automatically
+ *                          closed when the wrapper closes.
+ */
+KRDR_DECL(int) kRdrBufWrap(PPKRDR ppRdr, PKRDR pRdr, KBOOL fCloseIt)
 {
     KRDR_VALIDATE(pRdr);
-    return krdrBufWrapIt(ppRdr, pRdr, K_FALSE);
+    return krdrBufWrapIt(ppRdr, pRdr, fCloseIt);
+}
+
+
+/**
+ * Checks whether the file provider instance is of the buffered type or not.
+ *
+ * @returns K_TRUE if it is, otherwise K_FALSE.
+ * @param   pRdr            The file provider instance to check.
+ */
+KRDR_DECL(KBOOL) kRdrBufIsBuffered(PKRDR pRdr)
+{
+    KRDR_VALIDATE_EX(pRdr, K_FALSE);
+    return pRdr->pOps == &g_krdrBufOps;
 }