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

conf: no CamelCase, part I

Browse Source 
Renamed functions, types, variables.
This commit is contained in:
Max Kellermann
2009-01-17 20:23:27 +01:00
parent 2bbf378dd8
commit 4d472c265e
40 changed files with 204 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmdline.c
View File

@@ -143,17 +143,17 @@ void parseOptions(int argc, char **argv, Options *options)
path2 = g_build_filename(g_get_home_dir(),
USER_CONFIG_FILE_LOCATION2, NULL);
if (g_file_test(path1, G_FILE_TEST_IS_REGULAR))
readConf(path1);
config_read_file(path1);
else if (g_file_test(path2, G_FILE_TEST_IS_REGULAR))
readConf(path2);
config_read_file(path2);
else if (g_file_test(SYSTEM_CONFIG_FILE_LOCATION,
G_FILE_TEST_IS_REGULAR))
readConf(SYSTEM_CONFIG_FILE_LOCATION);
config_read_file(SYSTEM_CONFIG_FILE_LOCATION);
g_free(path1);
g_free(path2);
} else if (argc == 2) {
/* specified configuration file */
readConf(argv[1]);
config_read_file(argv[1]);
} else
g_error("too many arguments");
}