X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/4363757e38e4625de8a49cc3cbd8f04aa51a4167..0934814d5bd217ce663d32e95d4e044a6eefca7b:/lib/trackdb.c

diff --git a/lib/trackdb.c b/lib/trackdb.c
index 5bf2fed..3f4aee9 100644
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -441,6 +441,9 @@ void trackdb_open(int flags) {
     trackdb_existing_database = 0;
   }
   /* open the databases */
+  if(!(trackdb_usersdb = open_db("users.db",
+                                 0, DB_HASH, dbflags, 0600)))
+    fatal(0, "cannot open users.db");
   trackdb_tracksdb = open_db("tracks.db",
                              DB_RECNUM, DB_BTREE, dbflags, 0666);
   trackdb_searchdb = open_db("search.db",
@@ -451,8 +454,6 @@ void trackdb_open(int flags) {
   trackdb_globaldb = open_db("global.db", 0, DB_HASH, dbflags, 0666);
   trackdb_noticeddb = open_db("noticed.db",
                              DB_DUPSORT, DB_BTREE, dbflags, 0666);
-  trackdb_usersdb = open_db("users.db",
-                            0, DB_HASH, dbflags, 0600);
   if(!trackdb_existing_database) {
     /* Stash the database version */
     char buf[32];
@@ -2168,7 +2169,7 @@ static int reap_rescan(ev_source attribute((unused)) *ev,
  * @param ev Event loop or 0 to block
  * @param check 1 to recheck lengths, 0 to suppress check
  */
-void trackdb_rescan(ev_source *ev, int check) {
+void trackdb_rescan(ev_source *ev, int recheck) {
   int w;
 
   if(rescan_pid != -1) {
@@ -2176,7 +2177,7 @@ void trackdb_rescan(ev_source *ev, int check) {
     return;
   }
   rescan_pid = subprogram(ev, -1, RESCAN,
-                          check ? "--check" : "--no-check",
+                          recheck ? "--check" : "--no-check",
                           (char *)0);
   if(ev) {
     ev_child(ev, rescan_pid, 0, reap_rescan, 0);