From 0a6ffc5c9b3a40d1093d6c305b5e50c8ef109a5f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Jun 2018 11:58:38 +0200 Subject: [PATCH] string-util: put together strstrip() from skip_leading_chars() and delete_trailing_chars() --- src/basic/string-util.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/basic/string-util.c b/src/basic/string-util.c index a9362bf8bd..7ea478883b 100644 --- a/src/basic/string-util.c +++ b/src/basic/string-util.c @@ -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) {