From ae2dbf4bc29ce57ffe701535f18c6e54f3f056f6 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 17 Sep 2026 11:33:14 +0000 Subject: rename, and fix unvalid conversion from const to non-const --- include/util/string.h | 4 ++-- src/util/string.cc | 2 +- 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 &v, char **argv); -char **string2argv(const std::vector &v); +char **string2argv_alloc(const std::vector &v); void argv2string(std::vector &v, const char * const * argv); -size_t argv_get_required_size(std::vector &v); +size_t argv_get_required_size(const std::vector &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 &v, char **argv) * allocate heap memory, and construct C-style **argv * NB: user should be responsible to ::operator delete(); */ -char **string2argv(const std::vector &v) +char **string2argv_alloc(const std::vector &v) { size_t size = argv_get_required_size(v); char **p = static_cast(operator new(size)); -- cgit v1.3.1-4-g156e