From 7ef06a20b105bd0c1b8401ba96983a19f234cf95 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 24 Jun 2015 20:19:25 +0200 Subject: [PATCH] Use string_rtrim() from libSystem --- tools/settings.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tools/settings.c b/tools/settings.c index 9f4c5b1..6324923 100644 --- a/tools/settings.c +++ b/tools/settings.c @@ -194,7 +194,7 @@ static int _settings_browse(Settings * settings) for(i = 0, j = 0;; i++) if(p[i] == '\0') { - _settings_rtrim(&p[j], '/'); + string_rtrim(&p[j], "/"); _settings_browse_folder(settings, config, &p[j]); datadir |= (strcmp(&p[j], DATADIR) == 0); @@ -203,7 +203,7 @@ static int _settings_browse(Settings * settings) else if(p[i] == ':') { p[i] = '\0'; - _settings_rtrim(&p[j], '/'); + string_rtrim(&p[j], "/"); _settings_browse_folder(settings, config, &p[j]); datadir |= (strcmp(&p[j], DATADIR) == 0); @@ -388,17 +388,6 @@ static int _settings_browse_home(Settings * settings, Config * config) return ret; } -static void _settings_rtrim(String * string, char c) -{ - size_t len; - - for(len = string_length(string); len > 0; len--) - if(string[len - 1] == c) - string[len - 1] = '\0'; - else - break; -} - /* settings_error */ static int _settings_error(char const * message, int ret)