summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-13 19:46:24 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-18 19:11:43 (GMT)
commit07152630c3a9d04dd86f7b370ee30b553665f5c7 (patch)
tree5b3f57a46d6a4ae1f6a6c60cb095866a0e752ef9 /Swiften/Base/ByteArray.cpp
parent68b51298da4fcfcdc3bb81a9abba6c56809ae1b7 (diff)
downloadswift-07152630c3a9d04dd86f7b370ee30b553665f5c7.zip
swift-07152630c3a9d04dd86f7b370ee30b553665f5c7.tar.bz2
Chop off trailing \0 in ByteArray::toString().
Diffstat (limited to 'Swiften/Base/ByteArray.cpp')
-rw-r--r--Swiften/Base/ByteArray.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/Swiften/Base/ByteArray.cpp b/Swiften/Base/ByteArray.cpp
index c3869fc..323c866 100644
--- a/Swiften/Base/ByteArray.cpp
+++ b/Swiften/Base/ByteArray.cpp
@@ -72,4 +72,14 @@ std::vector<unsigned char> ByteArray::create(const unsigned char* c, size_t n) {
return data;
}
+std::string ByteArray::toString() const {
+ size_t i;
+ for (i = data_.size(); i > 0; --i) {
+ if (data_[i - 1] != 0) {
+ break;
+ }
+ }
+ return i > 0 ? std::string(reinterpret_cast<const char*>(getData()), i) : "";
+}
+
}