From 900bed550dadb3b757496767b960b22ae87eda80 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 25 Mar 2017 16:47:07 +0100 Subject: [PATCH] string.c, #6/6, use skip_ws() and skip_back_ws() --- src/misc/string.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/misc/string.c b/src/misc/string.c index 2bd39d3cb..91aea0786 100644 --- a/src/misc/string.c +++ b/src/misc/string.c @@ -661,18 +661,14 @@ str_has_arith_char(char *s) int get_comma_separated_values(char *values[], char *str) { int count = 0; - char *ptr, *comma_ptr, keep; + char *comma_ptr; while ((comma_ptr = strchr(str, ',')) != NULL) { - ptr = comma_ptr - 1; - while (isspace_c(*ptr)) - ptr--; - ptr++; keep = *ptr; *ptr = '\0'; - values[count++] = strdup(str); - *ptr = keep; + char *ptr = skip_back_ws(comma_ptr, str); + values[count++] = copy_substring(str, ptr); str = skip_ws(comma_ptr + 1); } - values[count++] = strdup(str); + values[count++] = copy(str); return count; }