Merge remote-tracking branch 'origin/master' into on-demand-loading

[apitrace] / trace_file.cpp

diff --git a/trace_file.cpp b/trace_file.cpp
index 758ecd78c264d6e218b001473489394607da4b8f..2d002868920feda1d7c2d48438bd8af5e88b8351 100644 (file)
--- a/trace_file.cpp
+++ b/trace_file.cpp
@@ -1,3 +1,29 @@
+/**************************************************************************
+ *
+ * Copyright 2011 Zack Rusin
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ **************************************************************************/
+
+
 #include "trace_file.hpp"
 
 #include "trace_snappyfile.hpp"
@@ -25,73 +51,19 @@ File::File(const std::string &filename,
     }
 }
 
-
 File::~File()
 {
     close();
 }
 
-bool File::isOpened() const
-{
-    return m_isOpened;
-}
-
-File::Mode File::mode() const
-{
-    return m_mode;
-}
-
-std::string File::filename() const
-{
-    return m_filename;
-}
-
-bool File::open(const std::string &filename, File::Mode mode)
-{
-    if (m_isOpened) {
-        close();
-    }
-    m_isOpened = rawOpen(filename, mode);
-    m_mode = mode;
-
-    return m_isOpened;
-}
-
-bool File::write(const void *buffer, int length)
-{
-    if (!m_isOpened || m_mode != File::Write) {
-        return false;
-    }
-    return rawWrite(buffer, length);
-}
-
-bool File::read(void *buffer, int length)
-{
-    if (!m_isOpened || m_mode != File::Read) {
-        return false;
-    }
-    return rawRead(buffer, length);
-}
 
-void File::close()
+File::Offset File::currentOffset()
 {
-    if (m_isOpened) {
-        rawClose();
-        m_isOpened = false;
-    }
+    return File::Offset();
 }
 
-void File::flush(FlushType type)
+void File::setCurrentOffset(const File::Offset &offset)
 {
-    rawFlush(type);
-}
-
-int File::getc()
-{
-    if (!m_isOpened || m_mode != File::Read) {
-        return 0;
-    }
-    return rawGetc();
 }
 
 bool File::isZLibCompressed(const std::string &filename)
@@ -144,12 +116,12 @@ bool ZLibFile::rawOpen(const std::string &filename, File::Mode mode)
     return m_gzFile != NULL;
 }
 
-bool ZLibFile::rawWrite(const void *buffer, int length)
+bool ZLibFile::rawWrite(const void *buffer, size_t length)
 {
     return gzwrite(m_gzFile, buffer, length) != -1;
 }
 
-bool ZLibFile::rawRead(void *buffer, int length)
+bool ZLibFile::rawRead(void *buffer, size_t length)
 {
     return gzread(m_gzFile, buffer, length) != -1;
 }
@@ -167,7 +139,18 @@ void ZLibFile::rawClose()
     }
 }
 
-void ZLibFile::rawFlush(FlushType type)
+void ZLibFile::rawFlush()
 {
     gzflush(m_gzFile, Z_SYNC_FLUSH);
 }
+
+
+bool ZLibFile::supportsOffsets() const
+{
+    return false;
+}
+
+bool ZLibFile::rawSkip(unsigned)
+{
+    return false;
+}