[MERGED] osmo-msc[master]: libmsc: db.c: Replace dbi APIs marked as deprecated

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed Dec 20 16:06:43 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: libmsc: db.c: Replace dbi APIs marked as deprecated
......................................................................


libmsc: db.c: Replace dbi APIs marked as deprecated

Several warning messages about those APIs being deprecated were printed
at compile time.

Change-Id: I6052159acf240cc7e8e2b3a3af10d8210708ddb6
---
M src/libmsc/db.c
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index 0104bce..0cb8ff3 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -47,6 +47,7 @@
 static char *db_basename = NULL;
 static char *db_dirname = NULL;
 static dbi_conn conn;
+static dbi_inst inst;
 
 #define SCHEMA_REVISION "5"
 
@@ -611,9 +612,9 @@
 
 int db_init(const char *name)
 {
-	dbi_initialize(NULL);
+	dbi_initialize_r(NULL, &inst);
 
-	conn = dbi_conn_new("sqlite3");
+	conn = dbi_conn_new_r("sqlite3", inst);
 	if (conn == NULL) {
 		LOGP(DDB, LOGL_FATAL, "Failed to create connection.\n");
 		return 1;
@@ -677,7 +678,7 @@
 int db_fini(void)
 {
 	dbi_conn_close(conn);
-	dbi_shutdown();
+	dbi_shutdown_r(inst);
 
 	free(db_dirname);
 	free(db_basename);

-- 
To view, visit https://gerrit.osmocom.org/5423
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6052159acf240cc7e8e2b3a3af10d8210708ddb6
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list