From: Teemu Toivola <git@humdi.net>
Date: Wed, 31 Jul 2019 21:19:40 +0000 (+0300)
Subject: there's only one database
X-Git-Tag: v2.4~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c056797f564a7f3b82d72f6d1ddcb7461bea6a71;p=vnstat

there's only one database
---

diff --git a/src/daemon.c b/src/daemon.c
index 572fe24..7491f43 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -268,7 +268,7 @@ void initdstate(DSTATE *s)
 	s->prevwaldbcheckpoint = time(NULL);
 }
 
-void preparedatabases(DSTATE *s)
+void preparedatabase(DSTATE *s)
 {
 	s->dbifcount = db_getinterfacecount();
 
diff --git a/src/daemon.h b/src/daemon.h
index 3fd3e2d..44efb47 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -19,7 +19,7 @@ void debugtimestamp(void);
 
 unsigned int addinterfaces(DSTATE *s);
 void initdstate(DSTATE *s);
-void preparedatabases(DSTATE *s);
+void preparedatabase(DSTATE *s);
 unsigned int importlegacydbs(DSTATE *s);
 void setsignaltraps(void);
 void filldatabaselist(DSTATE *s);
diff --git a/src/vnstatd.c b/src/vnstatd.c
index 784ac45..1ec9ad2 100644
--- a/src/vnstatd.c
+++ b/src/vnstatd.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
 	}
 
 	detectboot(&s);
-	preparedatabases(&s);
+	preparedatabase(&s);
 
 	if (!db_removeoldentries()) {
 		printf("Error: Database \"%s/%s\" cleanup failed: %s\n", cfg.dbdir, DATABASEFILE, strerror(errno));
diff --git a/tests/daemon_tests.c b/tests/daemon_tests.c
index 50e5e0c..d91629f 100644
--- a/tests/daemon_tests.c
+++ b/tests/daemon_tests.c
@@ -191,7 +191,7 @@ START_TEST(addinterfaces_adds_to_cache_when_running)
 }
 END_TEST
 
-START_TEST(preparedatabases_exits_with_no_database_dir)
+START_TEST(preparedatabase_exits_with_no_database_dir)
 {
 	DSTATE s;
 
@@ -200,11 +200,11 @@ START_TEST(preparedatabases_exits_with_no_database_dir)
 	suppress_output();
 	ck_assert_int_eq(remove_directory(TESTDIR), 1);
 
-	preparedatabases(&s);
+	preparedatabase(&s);
 }
 END_TEST
 
-START_TEST(preparedatabases_exits_with_no_databases)
+START_TEST(preparedatabase_exits_with_no_database)
 {
 	DSTATE s;
 
@@ -215,11 +215,11 @@ START_TEST(preparedatabases_exits_with_no_databases)
 	ck_assert_int_eq(remove_directory(TESTDIR), 1);
 	ck_assert_int_eq(clean_testdbdir(), 1);
 
-	preparedatabases(&s);
+	preparedatabase(&s);
 }
 END_TEST
 
-START_TEST(preparedatabases_exits_with_no_databases_and_noadd)
+START_TEST(preparedatabase_exits_with_no_database_and_noadd)
 {
 	DSTATE s;
 
@@ -231,11 +231,11 @@ START_TEST(preparedatabases_exits_with_no_databases_and_noadd)
 	ck_assert_int_eq(remove_directory(TESTDIR), 1);
 	ck_assert_int_eq(clean_testdbdir(), 1);
 
-	preparedatabases(&s);
+	preparedatabase(&s);
 }
 END_TEST
 
-START_TEST(preparedatabases_with_no_databases_creates_databases)
+START_TEST(preparedatabase_with_no_database_creates_database)
 {
 	int ret;
 	DSTATE s;
@@ -253,7 +253,7 @@ START_TEST(preparedatabases_with_no_databases_creates_databases)
 	ret = db_open_rw(1);
 	ck_assert_int_eq(ret, 1);
 
-	preparedatabases(&s);
+	preparedatabase(&s);
 
 	ck_assert_int_eq(db_getinterfacecountbyname("ethone"), 1);
 	ck_assert_int_eq(db_getinterfacecountbyname("ethtwo"), 1);
@@ -1445,10 +1445,10 @@ void add_daemon_tests(Suite *s)
 	tcase_add_test(tc_daemon, addinterfaces_adds_interfaces);
 	tcase_add_test(tc_daemon, addinterfaces_adds_only_new_interfaces);
 	tcase_add_test(tc_daemon, addinterfaces_adds_to_cache_when_running);
-	tcase_add_exit_test(tc_daemon, preparedatabases_exits_with_no_database_dir, 1);
-	tcase_add_exit_test(tc_daemon, preparedatabases_exits_with_no_databases, 1);
-	tcase_add_exit_test(tc_daemon, preparedatabases_exits_with_no_databases_and_noadd, 1);
-	tcase_add_test(tc_daemon, preparedatabases_with_no_databases_creates_databases);
+	tcase_add_exit_test(tc_daemon, preparedatabase_exits_with_no_database_dir, 1);
+	tcase_add_exit_test(tc_daemon, preparedatabase_exits_with_no_database, 1);
+	tcase_add_exit_test(tc_daemon, preparedatabase_exits_with_no_database_and_noadd, 1);
+	tcase_add_test(tc_daemon, preparedatabase_with_no_database_creates_database);
 	tcase_add_test(tc_daemon, setsignaltraps_does_not_exit);
 	tcase_add_exit_test(tc_daemon, filldatabaselist_exits_with_no_database_dir, 1);
 	tcase_add_test(tc_daemon, filldatabaselist_does_not_exit_with_empty_database_dir);