提交 7bacd1a0 authored 作者: Anthony Minessale's avatar Anthony Minessale

forgot a t

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1304 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 14fee784
...@@ -750,7 +750,7 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(switch_core ...@@ -750,7 +750,7 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(switch_core
\param filename the path to the db file to open \param filename the path to the db file to open
\return \return
*/ */
SWITCH_DECLARE(switch_core_db *) switch_core_db_open_file(char *filename); SWITCH_DECLARE(switch_core_db_t *) switch_core_db_open_file(char *filename);
#define SWITCH_CORE_DB "core" #define SWITCH_CORE_DB "core"
/*! /*!
......
...@@ -55,8 +55,8 @@ BEGIN_EXTERN_C ...@@ -55,8 +55,8 @@ BEGIN_EXTERN_C
* Each open sqlite database is represented by an instance of the * Each open sqlite database is represented by an instance of the
* following opaque structure. * following opaque structure.
*/ */
typedef sqlite3 switch_core_db; typedef sqlite3 switch_core_db_t;
typedef sqlite3_stmt switch_core_db_stmt; typedef sqlite3_stmt switch_core_db_stmt_t;
/** /**
* Aggregate functions use the following routine to allocate * Aggregate functions use the following routine to allocate
* a structure for storing their state. The first time this routine * a structure for storing their state. The first time this routine
......
...@@ -140,8 +140,8 @@ struct fileio_obj { ...@@ -140,8 +140,8 @@ struct fileio_obj {
struct db_obj { struct db_obj {
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
switch_core_db *db; switch_core_db_t *db;
switch_core_db_stmt *stmt; switch_core_db_stmt_t *stmt;
char *dbname; char *dbname;
char code_buffer[2048]; char code_buffer[2048];
JSContext *cx; JSContext *cx;
...@@ -1242,7 +1242,7 @@ JSClass fileio_class = { ...@@ -1242,7 +1242,7 @@ JSClass fileio_class = {
static JSBool db_construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) static JSBool db_construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
{ {
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
switch_core_db *db; switch_core_db_t *db;
struct db_obj *dbo; struct db_obj *dbo;
if (argc > 0) { if (argc > 0) {
......
...@@ -87,8 +87,8 @@ struct switch_core_runtime { ...@@ -87,8 +87,8 @@ struct switch_core_runtime {
apr_pool_t *memory_pool; apr_pool_t *memory_pool;
switch_hash_t *session_table; switch_hash_t *session_table;
switch_hash_t *stack_table; switch_hash_t *stack_table;
switch_core_db *db; switch_core_db_t *db;
switch_core_db *event_db; switch_core_db_t *event_db;
const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS];
int state_handler_index; int state_handler_index;
FILE *console; FILE *console;
...@@ -120,9 +120,9 @@ static void db_pick_path(char *dbname, char *buf, switch_size_t size) ...@@ -120,9 +120,9 @@ static void db_pick_path(char *dbname, char *buf, switch_size_t size)
} }
} }
SWITCH_DECLARE(switch_core_db *) switch_core_db_open_file(char *filename) SWITCH_DECLARE(switch_core_db_t *) switch_core_db_open_file(char *filename)
{ {
switch_core_db *db; switch_core_db_t *db;
char path[1024]; char path[1024];
db_pick_path(filename, path, sizeof(path)); db_pick_path(filename, path, sizeof(path));
...@@ -135,7 +135,7 @@ SWITCH_DECLARE(switch_core_db *) switch_core_db_open_file(char *filename) ...@@ -135,7 +135,7 @@ SWITCH_DECLARE(switch_core_db *) switch_core_db_open_file(char *filename)
} }
#if 0 #if 0
static void check_table_exists(switch_core_db *db, char *test_sql, char *create_sql) { static void check_table_exists(switch_core_db_t *db, char *test_sql, char *create_sql) {
char *errmsg; char *errmsg;
if(db) { if(db) {
...@@ -2495,7 +2495,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(char ...@@ -2495,7 +2495,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(char
return switch_core_session_request(endpoint_interface, pool); return switch_core_session_request(endpoint_interface, pool);
} }
static switch_status_t switch_core_sql_persistant_execute(switch_core_db *db, char *sql, uint32_t retries) static switch_status_t switch_core_sql_persistant_execute(switch_core_db_t *db, char *sql, uint32_t retries)
{ {
char *errmsg; char *errmsg;
switch_status_t status = SWITCH_STATUS_FALSE; switch_status_t status = SWITCH_STATUS_FALSE;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论