]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
MODAPP-292
authorRupa Schomaker <rupa@rupa.com>
Sat, 20 Jun 2009 14:09:35 +0000 (14:09 +0000)
committerRupa Schomaker <rupa@rupa.com>
Sat, 20 Jun 2009 14:09:35 +0000 (14:09 +0000)
del with changed config api in rev 13878

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13883 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_cidlookup/mod_cidlookup.c
src/mod/applications/mod_memcache/mod_memcache.c

index 44ce3dec26bea0d94e94f35da15307fe3ec16f7f..d1ded040eaf042dadf1b60210a695286f80fc57d 100755 (executable)
@@ -100,7 +100,7 @@ typedef struct callback_obj callback_t;
 
 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 @@ static switch_status_t config_callback_dsn(switch_xml_config_item_t *data, switc
        }
        
        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");
index 13274f24620098e1a84a85913989f6a9f48f203c..9b298aec8877f45cb4a6c1a64f076fd05661332a 100755 (executable)
@@ -55,18 +55,18 @@ static struct {
 
 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);