SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename strv_split_extract() to strv_split_full()

Browse Source 
Now that _full() is gone, we can rename _extract() to have the usual suffix
we use for the more featureful version.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-09-09 09:34:55 +02:00
parent 03b62851a9
commit 90e30d767a
12 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/env-util.c
+1 -1
View File
@@ -687,7 +687,7 @@ char **replace_env_argv(char **argv, char **env) {
if (e) {
int r;
r = strv_split_extract(&m, e, WHITESPACE, EXTRACT_RELAX|EXTRACT_UNQUOTE);
r = strv_split_full(&m, e, WHITESPACE, EXTRACT_RELAX|EXTRACT_UNQUOTE);
if (r < 0) {
ret[k] = NULL;
strv_free(ret);
src/basic/strv.c
+1 -1
View File
@@ -279,7 +279,7 @@ char **strv_split_newlines(const char *s) {
return l;
}
int strv_split_extract(char ***t, const char *s, const char *separators, ExtractFlags flags) {
int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags) {
_cleanup_strv_free_ char **l = NULL;
size_t n = 0, allocated = 0;
int r;
src/basic/strv.h
+2 -2
View File
@@ -74,12 +74,12 @@ static inline bool strv_isempty(char * const *l) {
char **strv_split_newlines(const char *s);
int strv_split_extract(char ***t, const char *s, const char *separators, ExtractFlags flags);
int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags);
static inline char **strv_split(const char *s, const char *separators) {
char **ret;
int r;
r = strv_split_extract(&ret, s, separators, 0);
r = strv_split_full(&ret, s, separators, 0);
if (r < 0)
return NULL;