Author: rupa Date: Sat Jun 20 09:09:35 2009 New Revision: 13883 Log: MODAPP-292 del with changed config api in rev 13878 Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Sat Jun 20 09:09:35 2009 @@ -100,7 +100,7 @@ static switch_event_node_t *reload_xml_event = NULL; -static switch_status_t config_callback_dsn(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) +static switch_status_t config_callback_dsn(switch_xml_config_item_t *data, const char *newvalue, switch_config_callback_type_t callback_type, switch_bool_t changed) { switch_status_t status = SWITCH_STATUS_SUCCESS; #ifdef SWITCH_HAVE_ODBC @@ -115,7 +115,7 @@ } if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) { - odbc_dsn = strdup(*((char**)data->ptr)); + odbc_dsn = strdup(newvalue); if(switch_strlen_zero(odbc_dsn)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No local database defined.\n"); Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Sat Jun 20 09:09:35 2009 @@ -55,18 +55,18 @@ static switch_event_node_t *NODE = NULL; -static switch_status_t config_callback_memcached(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) +static switch_status_t config_callback_memcached(switch_xml_config_item_t *data, const char *newvalue, switch_config_callback_type_t callback_type, switch_bool_t changed) { switch_status_t status = SWITCH_STATUS_SUCCESS; memcached_server_st *memcached_server = NULL; memcached_st *newmemcached = NULL; memcached_st *oldmemcached = NULL; - char *memcached_str = NULL; + const char *memcached_str = NULL; memcached_return rc; unsigned int servercount; if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) { - memcached_str = *((char**)data->ptr); + memcached_str = newvalue; /* initialize main ptr */ memcached_server = memcached_servers_parse(memcached_str);