From 7bacd1a0ad5e30f80871f0c1f8ca9766d7d1e176 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sun, 30 Apr 2006 17:54:05 +0000 Subject: [PATCH] forgot a t git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1304 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_core.h | 2 +- src/include/switch_sqlite.h | 4 ++-- .../languages/mod_spidermonkey/mod_spidermonkey.c | 6 +++--- src/switch_core.c | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/include/switch_core.h b/src/include/switch_core.h index c00399e638..2da608994c 100644 --- a/src/include/switch_core.h +++ b/src/include/switch_core.h @@ -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 \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" /*! diff --git a/src/include/switch_sqlite.h b/src/include/switch_sqlite.h index 296eba5e23..92e092a85b 100644 --- a/src/include/switch_sqlite.h +++ b/src/include/switch_sqlite.h @@ -55,8 +55,8 @@ BEGIN_EXTERN_C * Each open sqlite database is represented by an instance of the * following opaque structure. */ -typedef sqlite3 switch_core_db; -typedef sqlite3_stmt switch_core_db_stmt; +typedef sqlite3 switch_core_db_t; +typedef sqlite3_stmt switch_core_db_stmt_t; /** * Aggregate functions use the following routine to allocate * a structure for storing their state. The first time this routine diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index 2f377a5411..a4fcd2f5de 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -140,8 +140,8 @@ struct fileio_obj { struct db_obj { switch_memory_pool_t *pool; - switch_core_db *db; - switch_core_db_stmt *stmt; + switch_core_db_t *db; + switch_core_db_stmt_t *stmt; char *dbname; char code_buffer[2048]; JSContext *cx; @@ -1242,7 +1242,7 @@ JSClass fileio_class = { static JSBool db_construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { switch_memory_pool_t *pool; - switch_core_db *db; + switch_core_db_t *db; struct db_obj *dbo; if (argc > 0) { diff --git a/src/switch_core.c b/src/switch_core.c index 932237ab2a..f0a68e0f3c 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -87,8 +87,8 @@ struct switch_core_runtime { apr_pool_t *memory_pool; switch_hash_t *session_table; switch_hash_t *stack_table; - switch_core_db *db; - switch_core_db *event_db; + switch_core_db_t *db; + switch_core_db_t *event_db; const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; int state_handler_index; FILE *console; @@ -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]; db_pick_path(filename, path, sizeof(path)); @@ -135,7 +135,7 @@ SWITCH_DECLARE(switch_core_db *) switch_core_db_open_file(char *filename) } #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; if(db) { @@ -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); } -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; switch_status_t status = SWITCH_STATUS_FALSE;