From 429a2d1da6b3c4b2ad678ae23a06a3388acb81a6 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Sat, 25 Jul 2015 12:26:24 +0200 Subject: [PATCH] mxq_util: rename str_to_strvec() to strvec_from_str() --- mxq_util.c | 2 +- mxq_util.h | 2 +- mxqd.c | 2 +- test.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mxq_util.c b/mxq_util.c index 2279bdd3..3cb6baaa 100644 --- a/mxq_util.c +++ b/mxq_util.c @@ -210,7 +210,7 @@ void strvec_free(char **strvec) free(strvec); } -char **str_to_strvec(char *str) +char **strvec_from_str(char *str) { int res; char* s; diff --git a/mxq_util.h b/mxq_util.h index e2c15128..e2e85603 100644 --- a/mxq_util.h +++ b/mxq_util.h @@ -13,7 +13,7 @@ size_t strvec_length(char **strvec); int strvec_push_str(char ***strvecp, char *str); int strvec_push_strvec(char*** strvecp, char **strvec); char* strvec_to_str(char **strvec); -char** str_to_strvec(char *str); +char** strvec_from_str(char *str); void strvec_free(char **strvec); #endif diff --git a/mxqd.c b/mxqd.c index 17b4e079..d15037b6 100644 --- a/mxqd.c +++ b/mxqd.c @@ -1013,7 +1013,7 @@ unsigned long start_job(struct mxq_group_list *group) } - argv = str_to_strvec(mxqjob.job_argv_str); + argv = strvec_from_str(mxqjob.job_argv_str); if (!argv) { mx_log_err("job=%s(%d):%lu:%lu Can't recaculate commandline. str_to_strvev(%s) failed: %m", group->group.user_name, group->group.user_uid, group->group.group_id, mxqjob.job_id, diff --git a/test.c b/test.c index bf0c2a5f..9d21e944 100644 --- a/test.c +++ b/test.c @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) assert(str1 = strvec_to_str(strvec1)); assert(str3 = strdup(str1)); - assert(strvec3 = str_to_strvec(str3)); + assert(strvec3 = strvec_from_str(str3)); assert(str2 = strvec_to_str(strvec3)); display_mallinfo();