From 84ba60f45345eb07bd4debcd53f735cc1061a13e Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 1 Jan 2025 21:26:57 +0200 Subject: [PATCH] string-helpers: rtrim() with just char *s, call it later in string_strip char **s not needed to get trailing whitespace trimmed, and rtrim() does not return anything if there is leading whitespace in *s in call to string_strip(), there is less chars left to scan in rtrim(). --- src/common/string-helpers.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/string-helpers.c b/src/common/string-helpers.c index ef29c339..f753d1a1 100644 --- a/src/common/string-helpers.c +++ b/src/common/string-helpers.c @@ -30,14 +30,14 @@ trim_last_field(char *buf, char delim) } static void -rtrim(char **s) +rtrim(char *s) { - size_t len = strlen(*s); + size_t len = strlen(s); if (!len) { return; } - char *end = *s + len - 1; - while (end >= *s && isspace(*end)) { + char *end = s + len - 1; + while (end >= s && isspace(*end)) { end--; } *(end + 1) = '\0'; @@ -46,10 +46,10 @@ rtrim(char **s) char * string_strip(char *s) { - rtrim(&s); while (isspace(*s)) { s++; } + rtrim(s); return s; } -- 2.52.0