aboutsummaryrefslogtreecommitdiffstats
path: root/src/cmdline.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-17 20:23:27 +0100
committerMax Kellermann <max@duempel.org>2009-01-17 20:23:27 +0100
commit4d472c265ed0b3f7f61ee624c01c8ef319db7c99 (patch)
tree8ec3ea874c741c9b0e1ab70db2a96e02acec8225 /src/cmdline.c
parent2bbf378dd8a3f12b4b79228ce562402c29d2cd09 (diff)
downloadmpd-4d472c265ed0b3f7f61ee624c01c8ef319db7c99.tar.gz
mpd-4d472c265ed0b3f7f61ee624c01c8ef319db7c99.tar.xz
mpd-4d472c265ed0b3f7f61ee624c01c8ef319db7c99.zip
conf: no CamelCase, part I
Renamed functions, types, variables.
Diffstat (limited to '')
-rw-r--r--src/cmdline.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cmdline.c b/src/cmdline.c
index 14a22da34..71173ae38 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -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");
}