summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-02-25 20:06:37 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-02-25 20:06:37 +0100
commit24d3d5dac40562f22a43eb9934c90165ace92a35 (patch)
tree43f641312f850d0123f0d86a6a685f4e5ac6ffc9 /source
parentMoved the Speed member into cEntity class instead of its descendants. (diff)
downloadcuberite-24d3d5dac40562f22a43eb9934c90165ace92a35.tar
cuberite-24d3d5dac40562f22a43eb9934c90165ace92a35.tar.gz
cuberite-24d3d5dac40562f22a43eb9934c90165ace92a35.tar.bz2
cuberite-24d3d5dac40562f22a43eb9934c90165ace92a35.tar.lz
cuberite-24d3d5dac40562f22a43eb9934c90165ace92a35.tar.xz
cuberite-24d3d5dac40562f22a43eb9934c90165ace92a35.tar.zst
cuberite-24d3d5dac40562f22a43eb9934c90165ace92a35.zip
Diffstat (limited to '')
-rw-r--r--source/OSSupport/File.cpp3
-rw-r--r--source/OSSupport/GZipFile.cpp4
-rw-r--r--source/OSSupport/GZipFile.h4
3 files changed, 6 insertions, 5 deletions
diff --git a/source/OSSupport/File.cpp b/source/OSSupport/File.cpp
index 15a37a36f..bd2670217 100644
--- a/source/OSSupport/File.cpp
+++ b/source/OSSupport/File.cpp
@@ -94,10 +94,9 @@ bool cFile::Open(const AString & iFileName, eMode iMode)
void cFile::Close(void)
{
- ASSERT(IsOpen()); // You should not close file objects that don't have an open file.
-
if (!IsOpen())
{
+ // Closing an unopened file is a legal nop
return;
}
diff --git a/source/OSSupport/GZipFile.cpp b/source/OSSupport/GZipFile.cpp
index dbdef3a8b..c57de5198 100644
--- a/source/OSSupport/GZipFile.cpp
+++ b/source/OSSupport/GZipFile.cpp
@@ -85,7 +85,7 @@ int cGZipFile::ReadRestOfFile(AString & a_Contents)
-bool cGZipFile::Write(const AString & a_Contents)
+bool cGZipFile::Write(const char * a_Contents, int a_Size)
{
if (m_File == NULL)
{
@@ -99,7 +99,7 @@ bool cGZipFile::Write(const AString & a_Contents)
return false;
}
- return (gzwrite(m_File, a_Contents.data(), a_Contents.size()) != 0);
+ return (gzwrite(m_File, a_Contents, a_Size) != 0);
}
diff --git a/source/OSSupport/GZipFile.h b/source/OSSupport/GZipFile.h
index 10fb447dd..f20b4d11e 100644
--- a/source/OSSupport/GZipFile.h
+++ b/source/OSSupport/GZipFile.h
@@ -37,7 +37,9 @@ public:
int ReadRestOfFile(AString & a_Contents);
/// Writes a_Contents into file, compressing it along the way. Returns true if successful. Multiple writes are supported.
- bool Write(const AString & a_Contents);
+ bool Write(const AString & a_Contents) { return Write(a_Contents.data(), (int)(a_Contents.size())); }
+
+ bool Write(const char * a_Data, int a_Size);
protected:
gzFile m_File;