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

test/read_conf: make variables more local

Browse Source
This commit is contained in:
Max Kellermann 2011-07-03 15:20:39 +02:00
parent dca405a746
commit 52e2fa91c4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/read_conf.c
View File

@ -37,30 +37,28 @@ my_log_func(G_GNUC_UNUSED const gchar *log_domain,
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
const char *path, *name, *value;
GError *error = NULL;
bool success;
int ret;
if (argc != 3) { if (argc != 3) {
g_printerr("Usage: read_conf FILE SETTING\n"); g_printerr("Usage: read_conf FILE SETTING\n");
return 1; return 1;
} }
path = argv[1]; const char *path = argv[1];
name = argv[2]; const char *name = argv[2];
g_log_set_default_handler(my_log_func, NULL); g_log_set_default_handler(my_log_func, NULL);
config_global_init(); config_global_init();
success = config_read_file(path, &error);
GError *error = NULL;
bool success = config_read_file(path, &error);
if (!success) { if (!success) {
g_printerr("%s:", error->message); g_printerr("%s:", error->message);
g_error_free(error); g_error_free(error);
return 1; return 1;
} }
value = config_get_string(name, NULL); const char *value = config_get_string(name, NULL);
int ret;
if (value != NULL) { if (value != NULL) {
g_print("%s\n", value); g_print("%s\n", value);
ret = 0; ret = 0;