mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

stringop.c: refactor a few functions

Browse source
This commit is contained in:
Ian Fan 2019-01-17 16:56:04 +00:00 committed by Drew DeVault
parent 29a67a1a12
commit ab1b1dab1f
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/stringop.c
View file

@ -78,12 +78,10 @@ int lenient_strcmp(char *a, char *b) {
list_t *split_string(const char *str, const char *delims) { list_t *split_string(const char *str, const char *delims) {
list_t *res = create_list(); list_t *res = create_list();
char *copy = strdup(str); char *copy = strdup(str);
char *token;
token = strtok(copy, delims); char *token = strtok(copy, delims);
while(token) { while (token) {
token = strdup(token); list_add(res, strdup(token));
list_add(res, token);
token = strtok(NULL, delims); token = strtok(NULL, delims);
} }
free(copy); free(copy);
@ -268,13 +266,13 @@ char *argsep(char **stringp, const char *delim) {
escaped = !escaped; escaped = !escaped;
} else if (*end == '\0') { } else if (*end == '\0') {
*stringp = NULL; *stringp = NULL;
goto found; break;
} else if (!in_string && !in_char && !escaped && strchr(delim, *end)) { } else if (!in_string && !in_char && !escaped && strchr(delim, *end)) {
if (end - start) { if (end - start) {
*(end++) = 0; *(end++) = 0;
*stringp = end + strspn(end, delim);; *stringp = end + strspn(end, delim);;
if (!**stringp) *stringp = NULL; if (!**stringp) *stringp = NULL;
goto found; break;
} else { } else {
++start; ++start;
end = start; end = start;
@ -285,6 +283,5 @@ char *argsep(char **stringp, const char *delim) {
} }
++end; ++end;
} }
found:
return start; return start;
} }