aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-08 11:07:55 +0200
committerMax Kellermann <max@duempel.org>2008-10-08 11:07:55 +0200
commitbb8a9533b1a2df4ea34be2c6f053f22fe49a60d0 (patch)
tree40fbdabccc553f9681753d2b4bc6b4aeb9760951 /src/main.c
parent7a023eb0b2d41ae0511c45449abada94df04dd7d (diff)
downloadmpd-bb8a9533b1a2df4ea34be2c6f053f22fe49a60d0.tar.gz
mpd-bb8a9533b1a2df4ea34be2c6f053f22fe49a60d0.tar.xz
mpd-bb8a9533b1a2df4ea34be2c6f053f22fe49a60d0.zip
database: renamed functions, "db_" prefix and no CamelCase
Yet another CamelCase removal patch.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c
index 3e30e9d19..f0079e438 100644
--- a/src/main.c
+++ b/src/main.c
@@ -272,17 +272,17 @@ static void changeToUser(void)
static void openDB(Options * options, char *argv0)
{
- if (options->createDB > 0 || readDirectoryDB() < 0) {
+ if (options->createDB > 0 || db_load() < 0) {
if (options->createDB < 0) {
FATAL("can't open db file and using "
"\"--no-create-db\" command line option\n"
"try running \"%s --create-db\"\n", argv0);
}
flushWarningLog();
- if (checkDirectoryDB() < 0)
+ if (db_check() < 0)
exit(EXIT_FAILURE);
- directory_init();
- if (writeDirectoryDB() < 0)
+ db_init();
+ if (db_save() < 0)
exit(EXIT_FAILURE);
if (options->createDB)
exit(EXIT_SUCCESS);
@@ -456,8 +456,8 @@ int main(int argc, char *argv[])
finishPlaylist();
start = clock();
- directory_finish();
- DEBUG("directory_finish took %f seconds\n",
+ db_finish();
+ DEBUG("db_finish took %f seconds\n",
((float)(clock()-start))/CLOCKS_PER_SEC);
deinit_main_notify();