Use older functions out of deference to older distros

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@326750 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/db.c b/main/db.c
index a1fff2146fd91e48342be3080a61e28659f1375b..6a48b331fa291564553f24e99770384fb741e56b 100644 (file)
--- a/main/db.c
+++ b/main/db.c
@@ -127,7 +127,7 @@ DEFINE_SQL_STATEMENT(create_astdb_stmt, "CREATE TABLE IF NOT EXISTS astdb(key VA
 static int init_stmt(sqlite3_stmt **stmt, const char *sql, size_t len)
 {
        ast_mutex_lock(&dblock);
-       if (sqlite3_prepare_v2(astdb, sql, len, stmt, NULL) != SQLITE_OK) {
+       if (sqlite3_prepare(astdb, sql, len, stmt, NULL) != SQLITE_OK) {
                ast_log(LOG_WARNING, "Couldn't prepare statement '%s': %s\n", sql, sqlite3_errmsg(astdb));
                ast_mutex_unlock(&dblock);
                return -1;
@@ -211,7 +211,7 @@ static int db_open(void)
        }
 
        ast_mutex_lock(&dblock);
-       if (sqlite3_open_v2(dbname, &astdb, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL) != SQLITE_OK) {
+       if (sqlite3_open(dbname, &astdb) != SQLITE_OK) {
                ast_log(LOG_WARNING, "Unable to open Asterisk database '%s': %s\n", dbname, sqlite3_errmsg(astdb));
                sqlite3_close(astdb);
                ast_mutex_unlock(&dblock);

diff --git a/utils/astdb2sqlite3.c b/utils/astdb2sqlite3.c
index 254141744128708cef6d238ec683e87f037e724d..b0751dc3be2f6bde7fc4ef113c8ae1a40dc55dc9 100644 (file)
--- a/utils/astdb2sqlite3.c
+++ b/utils/astdb2sqlite3.c
@@ -134,7 +134,7 @@ static int convert_bdb_to_sqlite3(const char *bdb_dbname)
 
 static int init_stmt(sqlite3_stmt **stmt, const char *sql, size_t len)
 {
-       if (sqlite3_prepare_v2(astdb, sql, len, stmt, NULL) != SQLITE_OK) {
+       if (sqlite3_prepare(astdb, sql, len, stmt, NULL) != SQLITE_OK) {
                fprintf(stderr, "Couldn't prepare statement '%s': %s\n", sql, sqlite3_errmsg(astdb));
                return -1;
        }
@@ -171,7 +171,7 @@ static int init_statements(void)
 
 static int db_open(const char *dbname)
 {
-       if (sqlite3_open_v2(dbname, &astdb, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL) != SQLITE_OK) {
+       if (sqlite3_open(dbname, &astdb) != SQLITE_OK) {
                fprintf(stderr, "Unable to open Asterisk database '%s': %s\n", dbname, sqlite3_errmsg(astdb));
                sqlite3_close(astdb);
                return -1;