Skip to content

Commit

Permalink
mxq_util: rename str_to_strvec() to strvec_from_str()
Browse files Browse the repository at this point in the history
  • Loading branch information
mariux committed Jul 26, 2015
1 parent e2b6780 commit 429a2d1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion mxq_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mxq_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion mxqd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 429a2d1

Please sign in to comment.