aboutsummaryrefslogtreecommitdiff
path: root/src/serialization.cpp
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-06-27 06:56:26 -0700
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-06-27 06:56:26 -0700
commitf37a3a84fafb91bcfc109fed95aa6d42726f1bf7 (patch)
treecde1e5f47f191beb4a9cefcd87872aef53b5fcec /src/serialization.cpp
parente261cc9e8fa67c9020fa0a82bd1a7041ecd351a0 (diff)
parent13cf5425db613dc0a4323c87a4988bb18fb87aca (diff)
downloaddragonfireclient-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.xz
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/serialization.cpp')
-rw-r--r--src/serialization.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/serialization.cpp b/src/serialization.cpp
index 6a43d9190..ff7ca15f2 100644
--- a/src/serialization.cpp
+++ b/src/serialization.cpp
@@ -128,7 +128,7 @@ void decompressZlib(std::istream &is, std::ostream &os)
ret = inflateInit(&z);
if(ret != Z_OK)
- throw SerializationError("compressZlib: inflateInit failed");
+ throw SerializationError("dcompressZlib: inflateInit failed");
z.avail_in = 0;
@@ -162,7 +162,7 @@ void decompressZlib(std::istream &is, std::ostream &os)
|| status == Z_MEM_ERROR)
{
zerr(status);
- throw SerializationError("compressZlib: inflate failed");
+ throw SerializationError("decompressZlib: inflate failed");
}
int count = bufsize - z.avail_out;
//dstream<<"count="<<count<<std::endl;
@@ -182,7 +182,7 @@ void decompressZlib(std::istream &is, std::ostream &os)
{
dstream<<"unget #"<<i<<" failed"<<std::endl;
dstream<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
- throw SerializationError("compressZlib: unget failed");
+ throw SerializationError("decompressZlib: unget failed");
}
}