DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use string_rtrim() from libSystem

Browse Source
This commit is contained in:
Pierre Pronchery 2015-06-24 20:19:25 +02:00
parent 1bd29ef779
commit 7ef06a20b1
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/settings.c
View File

@ -194,7 +194,7 @@ static int _settings_browse(Settings * settings)
for(i = 0, j = 0;; i++) for(i = 0, j = 0;; i++)
if(p[i] == '\0') if(p[i] == '\0')
{ {
_settings_rtrim(&p[j], '/'); string_rtrim(&p[j], "/");
_settings_browse_folder(settings, config, _settings_browse_folder(settings, config,
&p[j]); &p[j]);
datadir |= (strcmp(&p[j], DATADIR) == 0); datadir |= (strcmp(&p[j], DATADIR) == 0);
@ -203,7 +203,7 @@ static int _settings_browse(Settings * settings)
else if(p[i] == ':') else if(p[i] == ':')
{ {
p[i] = '\0'; p[i] = '\0';
_settings_rtrim(&p[j], '/'); string_rtrim(&p[j], "/");
_settings_browse_folder(settings, config, _settings_browse_folder(settings, config,
&p[j]); &p[j]);
datadir |= (strcmp(&p[j], DATADIR) == 0); datadir |= (strcmp(&p[j], DATADIR) == 0);
@ -388,17 +388,6 @@ static int _settings_browse_home(Settings * settings, Config * config)
return ret; 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 */ /* settings_error */
static int _settings_error(char const * message, int ret) static int _settings_error(char const * message, int ret)