aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author_ov4 <ov4@ov4.org>2026-09-17 11:33:14 +0000
committer_ov4 <ov4@ov4.org>2026-09-17 11:33:14 +0000
commitae2dbf4bc29ce57ffe701535f18c6e54f3f056f6 (patch)
tree502dd42a5b6aa0109ba81c04e04baf206dfd9049
parent103c8137011c5987741cd9a67c2f31ee7a62d65e (diff)
rename, and fix unvalid conversion from const to non-const
-rw-r--r--include/util/string.h4
-rw-r--r--src/util/string.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/util/string.h b/include/util/string.h
index 6e6496c..be1d3c2 100644
--- a/include/util/string.h
+++ b/include/util/string.h
@@ -11,9 +11,9 @@ namespace ov4
{
void string2argv(const std::vector<std::string> &v, char **argv);
-char **string2argv(const std::vector<std::string> &v);
+char **string2argv_alloc(const std::vector<std::string> &v);
void argv2string(std::vector<std::string> &v, const char * const * argv);
-size_t argv_get_required_size(std::vector<std::string> &v);
+size_t argv_get_required_size(const std::vector<std::string> &v);
std::string safe_str(const char *s, const char *fallback = "");
void print_str_hex(const std::string &s);
diff --git a/src/util/string.cc b/src/util/string.cc
index 3bf34f7..bec9638 100644
--- a/src/util/string.cc
+++ b/src/util/string.cc
@@ -36,7 +36,7 @@ void string2argv(const vector<string> &v, char **argv)
* allocate heap memory, and construct C-style **argv
* NB: user should be responsible to ::operator delete();
*/
-char **string2argv(const std::vector<std::string> &v)
+char **string2argv_alloc(const std::vector<std::string> &v)
{
size_t size = argv_get_required_size(v);
char **p = static_cast<char**>(operator new(size));