summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/hashing.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2016-01-10 16:36:18 -0500
committer AJR <ajrhacker@users.noreply.github.com>2016-01-10 16:36:18 -0500
commit115db95642ad6d861aad63775b92350e0491f2dd (patch)
tree8e7538ca804610335bff1927dc3b4d974b4c06da /src/lib/util/hashing.cpp
parent2a2a4a3c6e255c479d5072d02c2a40949f611ea6 (diff)
Return std::string objects by value rather than pass by reference
- strprintf is unaltered, but strformat now takes one fewer argument - state_string_export still fills a buffer, but has been made const - get_default_card_software now takes no arguments but returns a string
Diffstat (limited to 'src/lib/util/hashing.cpp')
-rw-r--r--src/lib/util/hashing.cpp28
1 files changed, 12 insertions, 16 deletions
diff --git a/src/lib/util/hashing.cpp b/src/lib/util/hashing.cpp
index 785127e01e8..8e85e4a42d2 100644
--- a/src/lib/util/hashing.cpp
+++ b/src/lib/util/hashing.cpp
@@ -79,12 +79,12 @@ bool sha1_t::from_string(const char *string, int length)
// as_string - convert to a string
//-------------------------------------------------
-const char *sha1_t::as_string(std::string &buffer) const
+std::string sha1_t::as_string() const
{
- buffer.clear();
+ std::string buffer;
for (auto & elem : m_raw)
strcatprintf(buffer, "%02x", elem);
- return buffer.c_str();
+ return buffer;
}
@@ -122,12 +122,12 @@ bool md5_t::from_string(const char *string, int length)
// as_string - convert to a string
//-------------------------------------------------
-const char *md5_t::as_string(std::string &buffer) const
+std::string md5_t::as_string() const
{
- buffer.clear();
+ std::string buffer;
for (auto & elem : m_raw)
strcatprintf(buffer, "%02x", elem);
- return buffer.c_str();
+ return buffer;
}
@@ -166,10 +166,9 @@ bool crc32_t::from_string(const char *string, int length)
// as_string - convert to a string
//-------------------------------------------------
-const char *crc32_t::as_string(std::string &buffer) const
+std::string crc32_t::as_string() const
{
- strprintf(buffer, "%08x", m_raw);
- return buffer.c_str();
+ return strformat("%08x", m_raw);
}
@@ -215,21 +214,18 @@ bool crc16_t::from_string(const char *string, int length)
}
/**
- * @fn const char *crc16_t::as_string(std::string &buffer) const
+ * @fn std::string crc16_t::as_string() const
*
* @brief -------------------------------------------------
* as_string - convert to a string
* -------------------------------------------------.
*
- * @param [in,out] buffer The buffer.
- *
- * @return null if it fails, else a char*.
+ * @return a std::string.
*/
-const char *crc16_t::as_string(std::string &buffer) const
+std::string crc16_t::as_string() const
{
- strprintf(buffer, "%04x", m_raw);
- return buffer.c_str();
+ return strformat("%04x", m_raw);
}
/**