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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2015-10-08 19:39:23 +02:00
parent c5e49563e0
commit c8d34aa30c
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/configctl.c
View File

@ -31,6 +31,8 @@
/* prototypes */ /* prototypes */
static int _configctl(int verbose, int write, char const * filename, int argc, static int _configctl(int verbose, int write, char const * filename, int argc,
char * argv[]); char * argv[]);
static void _configctl_print(int verbose, char const * section,
char const * variable, char const * value);
static int _error(char const * progname, int ret); static int _error(char const * progname, int ret);
static int _usage(void); static int _usage(void);
@ -84,22 +86,11 @@ static int _configctl_do(int verbose, char const * filename,
if(verbose < 0) if(verbose < 0)
ret = (p != NULL) ? 0 : 1; ret = (p != NULL) ? 0 : 1;
else if(p != NULL) else if(p != NULL)
printf("%s%s%s%s%s\n", _configctl_print(verbose, section, key, value);
(verbose > 0 && section != NULL)
? section : "",
(verbose > 0 && section != NULL)
? "." : "",
(verbose > 0) ? key : "",
(verbose > 0) ? "=" : "", p);
} }
else if(value != NULL) else if(value != NULL)
{ {
printf("%s%s%s%s%s\n", _configctl_print(verbose, section, key, value);
(verbose > 0 && section != NULL) ? section : "",
(verbose > 0 && section != NULL) ? "." : "",
(verbose > 0) ? key : "",
(verbose > 0) ? "=" : "",
value);
if(config_set(config, section, key, value) != 0) if(config_set(config, section, key, value) != 0)
ret = _error(PROGNAME, 1); ret = _error(PROGNAME, 1);
if(config_save(config, filename) != 0) if(config_save(config, filename) != 0)
@ -112,6 +103,18 @@ static int _configctl_do(int verbose, char const * filename,
} }
/* configctl_print */
static void _configctl_print(int verbose, char const * section,
char const * variable, char const * value)
{
printf("%s%s%s%s%s\n", (verbose > 0 && section != NULL) ? section : "",
(verbose > 0 && section != NULL) ? "." : "",
(verbose > 0) ? variable : "",
(verbose > 0) ? "=" : "",
(value != NULL) ? value : "");
}
/* error */ /* error */
static int _error(char const * progname, int ret) static int _error(char const * progname, int ret)
{ {