picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

string-util: put together strstrip() from skip_leading_chars() and delete_trailing_chars()

This commit is contained in:
Lennart Poettering 2018-06-06 11:58:38 +02:00
parent af8974940d
commit 0a6ffc5c9b
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/basic/string-util.c
View File

@ -269,23 +269,12 @@ char *strjoin_real(const char *x, ...) {
}
char *strstrip(char *s) {
char *e;
if (!s)
return NULL;
/* Drops trailing whitespace. Modifies the string in
* place. Returns pointer to first non-space character */
/* Drops trailing whitespace. Modifies the string in place. Returns pointer to first non-space character */
s += strspn(s, WHITESPACE);
for (e = strchr(s, 0); e > s; e --)
if (!strchr(WHITESPACE, e[-1]))
break;
*e = 0;
return s;
return delete_trailing_chars(skip_leading_chars(s, WHITESPACE), WHITESPACE);
}
char *delete_chars(char *s, const char *bad) {