andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build errors related to util/status.cc

Browse Source 
Summary:
This is related to the upgrade to gcc7. The code change itself
is lifted from the following commits:

78ab11cd71
7bee48bdbd
This commit is contained in:
Levi Tamasi 2019-10-29 10:46:37 -07:00
parent a3fd64e040
commit 04f6516185
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/status.cc
View File

@ -9,25 +9,27 @@
#include "rocksdb/status.h" #include "rocksdb/status.h"
#include <stdio.h> #include <stdio.h>
#ifdef OS_WIN
#include <string.h>
#endif
#include <cstring> #include <cstring>
#include "port/port.h" #include "port/port.h"
namespace rocksdb { namespace rocksdb {
const char* Status::CopyState(const char* state) { const char* Status::CopyState(const char* state) {
const size_t cch =
std::strlen(state) + 1; // +1 for the null terminator
char* const result =
new char[cch];
result[cch - 1] = '\0';
#ifdef OS_WIN #ifdef OS_WIN
const size_t cch = std::strlen(state) + 1; // +1 for the null terminator
char* result = new char[cch];
errno_t ret; errno_t ret;
ret = strncpy_s(result, cch, state, cch - 1); ret = strncpy_s(result, cch, state, cch - 1);
result[cch - 1] = '\0';
assert(ret == 0); assert(ret == 0);
#else
std::strncpy(result, state, cch - 1);
#endif
return result; return result;
#else
const size_t cch = std::strlen(state) + 1; // +1 for the null terminator
return std::strncpy(new char[cch], state, cch);
#endif
} }
Status::Status(Code _code, SubCode _subcode, const Slice& msg, const Slice& msg2) Status::Status(Code _code, SubCode _subcode, const Slice& msg, const Slice& msg2)