COMMON: Add constructor to MemoryReadStream for strings

Creating a MemoryReadStream around a static string.
xoreos · Dec 24, 2016 · 54c5ddf · 54c5ddf
1 parent d07f2cd
commit 54c5ddf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/aurora/biffile.cpp b/src/aurora/biffile.cpp
@@ -99,7 +99,7 @@ void BIFFile::readVarResTable(Common::SeekableReadStream &bif, uint32 offset) {
 Common::SeekableReadStream *BIFFile::getResource(uint32 index) const {
 	const Resource &res = getRes(index);
 	if (res.size == 0)
-		return new Common::MemoryReadStream(0, 0);
+		return new Common::MemoryReadStream(static_cast<const byte *>(0), 0);
 
 	_bif->seek(res.offset);
 

diff --git a/src/aurora/bzffile.cpp b/src/aurora/bzffile.cpp
@@ -99,7 +99,7 @@ void BZFFile::readVarResTable(Common::SeekableReadStream &bzf, uint32 offset) {
 Common::SeekableReadStream *BZFFile::getResource(uint32 index) const {
 	const Resource &res = getRes(index);
 	if ((res.packedSize == 0) || (res.size == 0))
-		return new Common::MemoryReadStream(0, 0);
+		return new Common::MemoryReadStream(static_cast<const byte *>(0), 0);
 
 	_bzf->seek(res.offset);
 

diff --git a/src/common/memreadstream.h b/src/common/memreadstream.h
@@ -73,6 +73,14 @@ class MemoryReadStream : boost::noncopyable, public SeekableReadStream {
 
 	}
 
+	/** Create a MemoryReadStream around a static string buffer, optionally including the
+	 *  terminating \0. Never disposes its memory. */
+	MemoryReadStream(const char *str, bool useTerminator = false) :
+		_ptrOrig(reinterpret_cast<const byte *>(str), false), _ptr(reinterpret_cast<const byte *>(str)),
+		_size(strlen(str) + (useTerminator ? 1 : 0)), _pos(0), _eos(false) {
+
+	}
+
 	/** Template constructor to create a MemoryReadStream around a static array buffer.
 	 *  Never disposes its memory. */
 	template<size_t N>