summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/hashing.c
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
committer ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
commitcc3b682e52bf097d31db78032aad01d6a0b12e94 (patch)
tree860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/lib/util/hashing.c
parent7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff)
parenta649a95488e1fc85813dda747dc74c596496bd1c (diff)
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/lib/util/hashing.c')
-rw-r--r--src/lib/util/hashing.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/lib/util/hashing.c b/src/lib/util/hashing.c
index d7be3af1427..1481de34a12 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
+const char *crc32_t::as_string(std::string &buffer) const
{
- return buffer.format("%08x", m_raw).c_str();
+ 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();
}