aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/option_parse.cc2
-rw-r--r--src/util/string.cc16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/util/option_parse.cc b/src/util/option_parse.cc
index f9185fb..b294b75 100644
--- a/src/util/option_parse.cc
+++ b/src/util/option_parse.cc
@@ -20,7 +20,7 @@ namespace ov4
void exe_option(char **c_argv)
{
vector<string> argv;
- argv2string(&argv, c_argv);
+ argv2string(argv, c_argv);
for (auto c : argv)
{
diff --git a/src/util/string.cc b/src/util/string.cc
index cc0de34..c486a4f 100644
--- a/src/util/string.cc
+++ b/src/util/string.cc
@@ -5,33 +5,33 @@ using namespace std;
namespace ov4
{
-void string2argv(const vector<string> * const s, char **argv)
+void string2argv(const vector<string> &s, char **argv)
{
// pointers [0, size)
// nullptr [size]
// data [size+1, ...)
- char *p = (char*)(argv + s->size() + 1);
+ char *p = (char*)(argv + s.size() + 1);
- argv[s->size()] = nullptr;
+ argv[s.size()] = nullptr;
- for (size_t i = 0; i < s->size(); i++)
+ for (size_t i = 0; i < s.size(); i++)
{
- strcpy(p, (*s)[i].c_str());
+ strcpy(p, s[i].c_str());
argv[i] = p;
- p += (*s)[i].size() + 1; // for '\0'
+ p += s[i].size() + 1; // for '\0'
}
}
-void argv2string(vector<string> *s, const char * const * argv)
+void argv2string(vector<string> &s, const char * const * argv)
{
if (argv == nullptr) return;
for (size_t i = 0; true; i++)
{
if (argv[i] == nullptr) return;
- s->push_back(argv[i]);
+ s.push_back(argv[i]);
}
}