diff options
author | 2015-04-22 11:30:19 +0200 | |
---|---|---|
committer | 2015-04-22 11:30:45 +0200 | |
commit | 54f8b3ae5df6736c58b2a8398f9ac85da425c96d (patch) | |
tree | 5924033acf314625b14317b674adc9e9730c97cc /src/lib/util/hashing.c | |
parent | 946958136d85f2a1485dfb962487cba43ac6c048 (diff) |
moved all to std::string (nw)
Diffstat (limited to 'src/lib/util/hashing.c')
-rw-r--r-- | src/lib/util/hashing.c | 24 |
1 files changed, 13 insertions, 11 deletions
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(); } |