diff options
| -rw-r--r-- | include/openbsc/db.h | 2 | ||||
| -rw-r--r-- | src/bsc_hack.c | 2 | ||||
| -rw-r--r-- | src/db.c | 4 | ||||
| -rw-r--r-- | tests/db/db_test.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/include/openbsc/db.h b/include/openbsc/db.h index 203683257..61a3ac47c 100644 --- a/include/openbsc/db.h +++ b/include/openbsc/db.h @@ -26,7 +26,7 @@ #include <openbsc/gsm_subscriber.h> /* one time initialisation */ -int db_init(const char *name, struct gsm_network *network); +int db_init(const char *name); int db_prepare(); int db_fini(); diff --git a/src/bsc_hack.c b/src/bsc_hack.c index c80ffd583..188ccf6ae 100644 --- a/src/bsc_hack.c +++ b/src/bsc_hack.c @@ -970,7 +970,7 @@ static int bootstrap_network(void) bts = &gsmnet->bts[0]; bootstrap_bts(bts); - if (db_init(database_name, gsmnet)) { + if (db_init(database_name)) { printf("DB: Failed to init database. Please check the option settings.\n"); return -1; } @@ -32,7 +32,6 @@ static char *db_basename = NULL; static char *db_dirname = NULL; static dbi_conn conn; -static struct gsm_network *current_network = NULL; static char *create_stmts[] = { "CREATE TABLE IF NOT EXISTS Meta (" @@ -94,7 +93,7 @@ void db_error_func(dbi_conn conn, void* data) { printf("DBI: %s\n", msg); } -int db_init(const char *name, struct gsm_network *network) { +int db_init(const char *name) { dbi_initialize(NULL); conn = dbi_conn_new("sqlite3"); if (conn==NULL) { @@ -125,7 +124,6 @@ int db_init(const char *name, struct gsm_network *network) { return 1; } - current_network = network; return 0; } diff --git a/tests/db/db_test.c b/tests/db/db_test.c index bbca58585..6962aa3bf 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -50,7 +50,7 @@ int main() { - if (db_init("hlr.sqlite3", NULL)) { + if (db_init("hlr.sqlite3")) { printf("DB: Failed to init database. Please check the option settings.\n"); return 1; } |