From 543e8c1ee1708d413b09b51278a921da447780a0 Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Tue, 6 Apr 2004 15:26:46 +0000
Subject: [PATCH] make gdbm the default

---
 src/Makefile.am | 3 ++-
 src/db-gdbm.c   | 3 ++-
 src/main.c      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index e7109927..60855374 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,8 @@ mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \
 	daap-proto.c daap-proto.h daap.c daap.h db-gdbm.c db-memory.h \
 	mp3-scanner.h mp3-scanner.c playlist.c playlist.h rend-unix.c \
 	rend-unix.h lexer.l parser.y strcasestr.c strcasestr.h strsep.c \
-	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC)
+	redblack.c redblack.h \
+	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) 
 
 EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \
 	mDNSUNP.c mDNSPlatformFunctions.h mDNSPosix.h mDNSUNP.h \
diff --git a/src/db-gdbm.c b/src/db-gdbm.c
index e0c47c92..24d98f35 100644
--- a/src/db-gdbm.c
+++ b/src/db-gdbm.c
@@ -127,7 +127,8 @@ struct rbtree *db_removed;
 int db_start_initial_update(void);
 int db_end_initial_update(void);
 int db_is_empty(void);
-int db_init(char *parameters);
+int db_open(char *parameters);
+int db_init();
 int db_deinit(void);
 int db_version(void);
 int db_add(MP3FILE *mp3file);
diff --git a/src/main.c b/src/main.c
index d383e3ed..0fbfc3c0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -481,7 +481,7 @@ int main(int argc, char *argv[]) {
     }
 
 
-    if(db_open(config.db_dir)) {
+    if(db_open(config.dbdir)) {
 	perror("db_open");
 	exit(EXIT_FAILURE);
     }