From 54f8b3ae5df6736c58b2a8398f9ac85da425c96d Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 22 Apr 2015 11:30:19 +0200 Subject: moved all to std::string (nw) --- src/lib/util/hashing.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/lib/util/hashing.c') diff --git a/src/lib/util/hashing.c b/src/lib/util/hashing.c index d7be3af1427..b4e2b7a9d6d 100644 --- a/src/lib/util/hashing.c +++ b/src/lib/util/hashing.c @@ -79,11 +79,11 @@ bool sha1_t::from_string(const char *string, int length) // as_string - convert to a string //------------------------------------------------- -const char *sha1_t::as_string(astring &buffer) const +const char *sha1_t::as_string(std::string &buffer) const { - buffer.reset(); + buffer.clear(); for (int i = 0; i < ARRAY_LENGTH(m_raw); i++) - buffer.catformat("%02x", m_raw[i]); + strcatprintf(buffer, "%02x", m_raw[i]); return buffer.c_str(); } @@ -122,11 +122,11 @@ bool md5_t::from_string(const char *string, int length) // as_string - convert to a string //------------------------------------------------- -const char *md5_t::as_string(astring &buffer) const +const char *md5_t::as_string(std::string &buffer) const { - buffer.reset(); + buffer.clear(); for (int i = 0; i < ARRAY_LENGTH(m_raw); i++) - buffer.catformat("%02x", m_raw[i]); + strcatprintf(buffer, "%02x", m_raw[i]); return buffer.c_str(); } @@ -166,9 +166,10 @@ bool crc32_t::from_string(const char *string, int length) // as_string - convert to a string //------------------------------------------------- -const char *crc32_t::as_string(astring &buffer) const -{ - return buffer.format("%08x", m_raw).c_str(); +const char *crc32_t::as_string(std::string &buffer) const +{ + strprintf(buffer, "%08x", m_raw); + return buffer.c_str(); } @@ -218,9 +219,10 @@ bool crc16_t::from_string(const char *string, int length) // as_string - convert to a string //------------------------------------------------- -const char *crc16_t::as_string(astring &buffer) const +const char *crc16_t::as_string(std::string &buffer) const { - return buffer.format("%04x", m_raw).c_str(); + strprintf(buffer, "%04x", m_raw); + return buffer.c_str(); } -- cgit v1.2.3-70-g09d2