Return -1 upon errors

This commit is contained in:
Pierre Pronchery 2015-10-10 00:09:47 +02:00
parent 63cbc19628
commit ca1955c8a8

View File

@ -56,11 +56,11 @@ static int _configctl(int verbose, int write, char const * filename, int argc,
char * value = NULL;
if((config = config_new()) == NULL)
return _error(PROGNAME, 1);
return -_error(PROGNAME, 1);
if(config_load(config, filename) != 0)
{
config_delete(config);
return _error(PROGNAME, 1);
return -_error(PROGNAME, 1);
}
for(i = 0; i < argc; i++)
{
@ -77,7 +77,7 @@ static int _configctl(int verbose, int write, char const * filename, int argc,
ret |= _configctl_do(config, verbose, section, key, value);
}
if(ret == 0 && write && config_save(config, filename) != 0)
ret = _error(PROGNAME, 1);
ret = -_error(PROGNAME, 1);
config_delete(config);
return ret;
}
@ -92,7 +92,7 @@ static int _configctl_do(Config * config, int verbose, char const * section,
{
p = config_get(config, section, key);
if(verbose < 0)
ret = (p != NULL) ? 0 : 1;
ret = (p != NULL) ? 0 : -1;
else if(p != NULL)
_configctl_print(verbose, section, key, value);
}
@ -100,10 +100,10 @@ static int _configctl_do(Config * config, int verbose, char const * section,
{
_configctl_print(verbose, section, key, value);
if(config_set(config, section, key, value) != 0)
ret = _error(PROGNAME, 1);
ret = -_error(PROGNAME, 1);
}
else
ret = _error(PROGNAME, 1);
ret = -_error(PROGNAME, 1);
return ret;
}
@ -118,11 +118,11 @@ static int _configctl_list(char const * filename)
Config * config;
if((config = config_new()) == NULL)
return _error(PROGNAME, 1);
return -_error(PROGNAME, 1);
if(config_load(config, filename) != 0)
{
config_delete(config);
return _error(PROGNAME, 1);
return -_error(PROGNAME, 1);
}
config_foreach(config, _list_foreach, config);
config_delete(config);