diff options
author | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-12-08 14:17:44 +0800 |
---|---|---|
committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-12-21 23:38:03 +0800 |
commit | 9cec0ad02c056c8c22b61847833fe6b27b7badda (patch) | |
tree | e696baaa8ac54ab58a5312ee806deb0c0a313f44 /common.cpp | |
parent | 11bece80a83eafeb436eae87aa5d6e8c88e47691 (diff) |
Solaris build fixes: use memset instead of bzero
Diffstat (limited to 'common.cpp')
-rw-r--r-- | common.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -217,14 +217,14 @@ static wcstring str2wcs_internal(const char *in, const size_t in_len) wc = ENCODE_DIRECT_BASE + (unsigned char)in[in_pos]; result.push_back(wc); in_pos++; - bzero(&state, sizeof state); + memset(&state, 0, sizeof state); } else if (ret == 0) { /* Embedded null byte! */ result.push_back(L'\0'); in_pos++; - bzero(&state, sizeof state); + memset(&state, 0, sizeof state); } else { @@ -315,7 +315,7 @@ std::string wcs2string(const wcstring &input) } else { - bzero(converted, sizeof converted); + memset(converted, 0, sizeof converted); size_t len = wcrtomb(converted, wc, &state); if (len == (size_t)(-1)) { @@ -1996,7 +1996,7 @@ void format_size_safe(char buff[128], unsigned long long sz) { const size_t buff_size = 128; const size_t max_len = buff_size - 1; //need to leave room for a null terminator - bzero(buff, buff_size); + memset(buff, 0, buff_size); size_t idx = 0; const char * const sz_name[]= { |