no need to copy the strings, just reference them
This commit is contained in:
parent
3ac00a66ff
commit
09b04e4bd6
1 changed files with 3 additions and 7 deletions
|
@ -20,10 +20,9 @@ const char** convert_to_c(const std::vector<std::string> strings) {
|
||||||
// Note: perfectly fine to "new" const char*.
|
// Note: perfectly fine to "new" const char*.
|
||||||
const char** strings_c = new const char*[strings.size()+1];
|
const char** strings_c = new const char*[strings.size()+1];
|
||||||
for (size_t i = 0; i < strings.size(); ++i) {
|
for (size_t i = 0; i < strings.size(); ++i) {
|
||||||
// XXX No need to copy the string here.
|
// Note: const char** = non-const "array" to const char*, i.e. can modify
|
||||||
char* string_c = new char[strings.at(i).size()+1];
|
// pointers to the strings but not the strings themselves.
|
||||||
strncpy(string_c, strings.at(i).c_str(), strings.at(i).size()+1);
|
strings_c[i] = strings.at(i).c_str();
|
||||||
strings_c[i] = string_c;
|
|
||||||
}
|
}
|
||||||
strings_c[strings.size()] = NULL;
|
strings_c[strings.size()] = NULL;
|
||||||
|
|
||||||
|
@ -31,9 +30,6 @@ const char** convert_to_c(const std::vector<std::string> strings) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_c(const char** strings_c) {
|
void free_c(const char** strings_c) {
|
||||||
for (size_t i = 0; strings_c[i] != NULL; ++i) {
|
|
||||||
delete[] strings_c[i];
|
|
||||||
}
|
|
||||||
delete[] strings_c;
|
delete[] strings_c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue