From 91605d3f4df9b9fb1490c276053ff274fb728816 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 3 Dec 2015 18:17:25 +0100 Subject: clang-modernize part 1 (nw) --- src/lib/util/hashing.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/lib/util/hashing.cpp') diff --git a/src/lib/util/hashing.cpp b/src/lib/util/hashing.cpp index e7f315ecc53..785127e01e8 100644 --- a/src/lib/util/hashing.cpp +++ b/src/lib/util/hashing.cpp @@ -63,13 +63,13 @@ bool sha1_t::from_string(const char *string, int length) return false; // iterate through our raw buffer - for (int bytenum = 0; bytenum < sizeof(m_raw); bytenum++) + for (auto & elem : m_raw) { int upper = char_to_hex(*string++); int lower = char_to_hex(*string++); if (upper == -1 || lower == -1) return false; - m_raw[bytenum] = (upper << 4) | lower; + elem = (upper << 4) | lower; } return true; } @@ -82,8 +82,8 @@ bool sha1_t::from_string(const char *string, int length) const char *sha1_t::as_string(std::string &buffer) const { buffer.clear(); - for (int i = 0; i < ARRAY_LENGTH(m_raw); i++) - strcatprintf(buffer, "%02x", m_raw[i]); + for (auto & elem : m_raw) + strcatprintf(buffer, "%02x", elem); return buffer.c_str(); } @@ -106,13 +106,13 @@ bool md5_t::from_string(const char *string, int length) return false; // iterate through our raw buffer - for (int bytenum = 0; bytenum < sizeof(m_raw); bytenum++) + for (auto & elem : m_raw) { int upper = char_to_hex(*string++); int lower = char_to_hex(*string++); if (upper == -1 || lower == -1) return false; - m_raw[bytenum] = (upper << 4) | lower; + elem = (upper << 4) | lower; } return true; } @@ -125,8 +125,8 @@ bool md5_t::from_string(const char *string, int length) const char *md5_t::as_string(std::string &buffer) const { buffer.clear(); - for (int i = 0; i < ARRAY_LENGTH(m_raw); i++) - strcatprintf(buffer, "%02x", m_raw[i]); + for (auto & elem : m_raw) + strcatprintf(buffer, "%02x", elem); return buffer.c_str(); } -- cgit v1.2.3-70-g09d2