kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-02 17:03:52 +00:00
Code Issues Projects Releases Wiki Activity

fix var type warnings in mod_lcr

Browse Source
This commit is contained in:
Michael Jerris 2014-03-15 22:23:46 -04:00
parent 4ee5d1f617
commit aea7800a42
1 changed files with 9 additions and 13 deletions

22
src/mod/applications/mod_lcr/mod_lcr.c

@ -581,16 +581,16 @@ static char *format_custom_sql(const char *custom_sql, callback_t *cb_struct, co
return (char *) custom_sql; return (char *) custom_sql;
} }
static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) static switch_status_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata)
{ {
switch_bool_t retval = SWITCH_FALSE; switch_status_t retval = SWITCH_STATUS_GENERR;
switch_cache_db_handle_t *dbh = NULL; switch_cache_db_handle_t *dbh = NULL;
if (globals.odbc_dsn && (dbh = lcr_get_db_handle())) { if (globals.odbc_dsn && (dbh = lcr_get_db_handle())) {
if (switch_cache_db_execute_sql_callback(dbh, sql, callback, pdata, NULL) != SWITCH_STATUS_SUCCESS) { if (switch_cache_db_execute_sql_callback(dbh, sql, callback, pdata, NULL) != SWITCH_STATUS_SUCCESS) {
retval = SWITCH_FALSE; retval = SWITCH_STATUS_GENERR;
} else { } else {
retval = SWITCH_TRUE; retval = SWITCH_STATUS_SUCCESS;
} }
} }
switch_cache_db_release_db_handle(&dbh); switch_cache_db_release_db_handle(&dbh);
@ -885,7 +885,7 @@ static switch_status_t lcr_do_lookup(callback_t *cb_struct)
char *digits_expanded = NULL; char *digits_expanded = NULL;
char *lrn_digits_expanded = NULL; char *lrn_digits_expanded = NULL;
profile_t *profile = cb_struct->profile; profile_t *profile = cb_struct->profile;
switch_bool_t lookup_status; switch_status_t lookup_status;
switch_channel_t *channel; switch_channel_t *channel;
char *id_str; char *id_str;
char *safe_sql = NULL; char *safe_sql = NULL;
@ -987,11 +987,7 @@ static switch_status_t lcr_do_lookup(callback_t *cb_struct)
switch_safe_free(sql_stream.data); switch_safe_free(sql_stream.data);
switch_core_hash_destroy(&cb_struct->dedup_hash); switch_core_hash_destroy(&cb_struct->dedup_hash);
if (lookup_status) { return lookup_status;
return SWITCH_STATUS_SUCCESS;
} else {
return SWITCH_STATUS_GENERR;
}
} }
static switch_bool_t test_profile(char *lcr_profile) static switch_bool_t test_profile(char *lcr_profile)
@ -1175,7 +1171,7 @@ static switch_status_t lcr_load_config()
if (db_check("ALTER TABLE carrier_gateway add codec varchar(255);") == SWITCH_TRUE) { if (db_check("ALTER TABLE carrier_gateway add codec varchar(255);") == SWITCH_TRUE) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "adding codec field your lcr carrier_gateway database schema.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "adding codec field your lcr carrier_gateway database schema.\n");
} else { } else {
return SWITCH_FALSE; return SWITCH_STATUS_FALSE;
} }
} }
@ -1186,7 +1182,7 @@ static switch_status_t lcr_load_config()
if (db_check("ALTER TABLE lcr add cid varchar(32);") == SWITCH_TRUE) { if (db_check("ALTER TABLE lcr add cid varchar(32);") == SWITCH_TRUE) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "adding cid field to your lcr database schema.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "adding cid field to your lcr database schema.\n");
} else { } else {
return SWITCH_FALSE; return SWITCH_STATUS_FALSE;
} }
} }
@ -1194,7 +1190,7 @@ static switch_status_t lcr_load_config()
if (db_check("ALTER TABLE lcr ADD lrn BOOLEAN NOT NULL DEFAULT false")) { if (db_check("ALTER TABLE lcr ADD lrn BOOLEAN NOT NULL DEFAULT false")) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "adding lrn field to your lcr database schema.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "adding lrn field to your lcr database schema.\n");
} else { } else {
return SWITCH_FALSE; return SWITCH_STATUS_FALSE;
} }
} }