oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ConfigFile: simplify error cleanup

Browse Source
This commit is contained in:
Max Kellermann 2013-01-30 19:59:49 +01:00
parent e294ccae24
commit ac887d3afb
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/ConfigFile.cxx
View File

@ -136,26 +136,15 @@ config_read_block(FILE *fp, int *count, char *string, GError **error_r)
} }
} }
bool static bool
ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r) ReadConfigFile(ConfigData &config_data, FILE *fp, GError **error_r)
{ {
assert(!path.IsNull()); assert(fp != nullptr);
const std::string path_utf8 = path.ToUTF8();
FILE *fp;
char string[MAX_STRING_SIZE + 1]; char string[MAX_STRING_SIZE + 1];
int count = 0; int count = 0;
struct config_param *param; struct config_param *param;
g_debug("loading file %s", path_utf8.c_str());
if (!(fp = FOpen(path, "r"))) {
g_set_error(error_r, config_quark(), errno,
"Failed to open %s: %s",
path_utf8.c_str(), g_strerror(errno));
return false;
}
while (fgets(string, MAX_STRING_SIZE, fp)) { while (fgets(string, MAX_STRING_SIZE, fp)) {
char *line; char *line;
const char *name, *value; const char *name, *value;
@ -175,7 +164,6 @@ ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
assert(*line != 0); assert(*line != 0);
g_propagate_prefixed_error(error_r, error, g_propagate_prefixed_error(error_r, error,
"line %i: ", count); "line %i: ", count);
fclose(fp);
return false; return false;
} }
@ -187,7 +175,6 @@ ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
g_set_error(error_r, config_quark(), 0, g_set_error(error_r, config_quark(), 0,
"unrecognized parameter in config file at " "unrecognized parameter in config file at "
"line %i: %s\n", count, name); "line %i: %s\n", count, name);
fclose(fp);
return false; return false;
} }
@ -201,7 +188,6 @@ ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
"config parameter \"%s\" is first defined " "config parameter \"%s\" is first defined "
"on line %i and redefined on line %i\n", "on line %i and redefined on line %i\n",
name, param->line, count); name, param->line, count);
fclose(fp);
return false; return false;
} }
@ -213,7 +199,6 @@ ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
if (*line != '{') { if (*line != '{') {
g_set_error(error_r, config_quark(), 0, g_set_error(error_r, config_quark(), 0,
"line %i: '{' expected", count); "line %i: '{' expected", count);
fclose(fp);
return false; return false;
} }
@ -222,13 +207,11 @@ ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
g_set_error(error_r, config_quark(), 0, g_set_error(error_r, config_quark(), 0,
"line %i: Unknown tokens after '{'", "line %i: Unknown tokens after '{'",
count); count);
fclose(fp);
return false; return false;
} }
param = config_read_block(fp, &count, string, error_r); param = config_read_block(fp, &count, string, error_r);
if (param == NULL) { if (param == NULL) {
fclose(fp);
return false; return false;
} }
} else { } else {
@ -247,7 +230,6 @@ ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
g_error_free(error); g_error_free(error);
} }
fclose(fp);
return false; return false;
} }
@ -255,7 +237,6 @@ ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
g_set_error(error_r, config_quark(), 0, g_set_error(error_r, config_quark(), 0,
"line %i: Unknown tokens after value", "line %i: Unknown tokens after value",
count); count);
fclose(fp);
return false; return false;
} }
@ -264,7 +245,27 @@ ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
params = g_slist_append(params, param); params = g_slist_append(params, param);
} }
fclose(fp);
return true; return true;
} }
bool
ReadConfigFile(ConfigData &config_data, const Path &path, GError **error_r)
{
assert(!path.IsNull());
const std::string path_utf8 = path.ToUTF8();
g_debug("loading file %s", path_utf8.c_str());
FILE *fp = FOpen(path, "r");
if (fp == nullptr) {
g_set_error(error_r, config_quark(), errno,
"Failed to open %s: %s",
path_utf8.c_str(), g_strerror(errno));
return false;
}
bool result = ReadConfigFile(config_data, fp, error_r);
fclose(fp);
return result;
}