From 66f9db6d03e6736e088ff354d99c5ee3efedec29 Mon Sep 17 00:00:00 2001 From: twilson Date: Thu, 7 Jul 2011 16:50:54 +0000 Subject: [PATCH] Use older functions out of deference to older distros git-svn-id: http://svn.digium.com/svn/asterisk/trunk@326750 f38db490-d61c-443f-a65b-d21fe96a405b --- main/db.c | 4 ++-- utils/astdb2sqlite3.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/db.c b/main/db.c index a1fff2146..6a48b331f 100644 --- 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 254141744..b0751dc3b 100644 --- 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;