windows build fixes.

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

diff --git a/src/mod/applications/mod_enum/mod_enum.vcproj b/src/mod/applications/mod_enum/mod_enum.vcproj
index f2f20c08ab86fbc022097dc957d7ff8995a6b61e..14eff41e5e17f8c37e6cf3d9f78d60d46d55648b 100644 (file)
--- a/src/mod/applications/mod_enum/mod_enum.vcproj
+++ b/src/mod/applications/mod_enum/mod_enum.vcproj
@@ -123,6 +123,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\udns&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="2"\r

diff --git a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
index 81abd7b72b7522327e5d5d29d10cb36bc6260e75..ac9029d2b1d25f18b77e5302babe9379433da6ce 100644 (file)
--- a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
+++ b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
@@ -916,7 +916,7 @@ static switch_status_t openmrcp_destroy()
                openmrcp_module.tts_profile = NULL;
        }
 
-       switch_core_hash_destroy(openmrcp_module.profile_hash);
+       switch_core_hash_destroy(&openmrcp_module.profile_hash);
        openmrcp_module.profile_hash = NULL;
 
        /* one-time mrcp global destroy */

diff --git a/src/mod/event_handlers/mod_cdr/basecdr.cpp b/src/mod/event_handlers/mod_cdr/basecdr.cpp
index 7c77a6d08f0aaf1c8ec0c23bc0f7c49e47cbdeb7..31a3b3b6ed12babd19f413a86f443f2dba76d35b 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/basecdr.cpp
+++ b/src/mod/event_handlers/mod_cdr/basecdr.cpp
@@ -326,49 +326,43 @@ void BaseCDR::process_channel_variables(const std::list<std::string>& stringlist
 // This one is for processing of supplemental chanvars
 void BaseCDR::process_channel_variables(const std::list<std::string>& stringlist, const std::list<std::string>& fixedlist, switch_channel_t *channel,bool repeat)
 {
-       if(stringlist.front() == "*")
-       {
-               switch_hash_index_t *hi;
-               void *val;
-               const void *var;
+       if(stringlist.front() == "*") {
+               switch_event_header_t *hi;
                switch_memory_pool_t *sessionpool;
                sessionpool = switch_core_session_get_pool(coresession);
-               for (hi = switch_channel_variable_first(channel); hi; hi = switch_hash_next(hi)) 
-               {
-                       switch_hash_this(hi, &var, 0, &val);
-                       std::string tempstring_first, tempstring_second;
-                       tempstring_first = (char *) var;
-                       tempstring_second = (char *) val;
-                       chanvars_supp[tempstring_first] = tempstring_second;
+
+               if ((hi = switch_channel_variable_first(channel))) {
+                       for (; hi; hi = hi->next) {
+                               std::string name, value;
+                               name = hi->name;
+                               value = hi->value;
+                               
+                               chanvars_supp[name] = value;
+                       }
+                       switch_channel_variable_last(channel);
                }
-               switch_channel_variable_last(channel);
-       }
-       else
-       {
+       } else {
                std::list<std::string>::const_iterator iItr,iEnd;
                iEnd = stringlist.end();
                        
-               for(iItr = stringlist.begin(); iItr != iEnd; iItr++)
-               {
+               for (iItr = stringlist.begin(); iItr != iEnd; iItr++) {
                        std::vector<char> tempstringvector(iItr->begin(), iItr->end());
                        tempstringvector.push_back('\0');
                        char* tempstring= &tempstringvector[0];
 
                        char *tempvariable;
                        tempvariable = switch_channel_get_variable(channel,tempstring);
-                       if(!switch_strlen_zero(tempvariable))
+                       if (!switch_strlen_zero(tempvariable))
                                chanvars_supp[*iItr] = tempvariable;
                }
        }
        
-       if(!repeat)
-       {
+       if (!repeat) {
                std::map<std::string,std::string>::iterator MapItr;
                std::list<std::string>::const_iterator iItr,iEnd;
-               for(iItr = fixedlist.begin(), iEnd = fixedlist.end(); iItr != iEnd; iItr++)
-               {
+               for (iItr = fixedlist.begin(), iEnd = fixedlist.end(); iItr != iEnd; iItr++) {
                        MapItr = chanvars_supp.find(*iItr);
-                       if(MapItr != chanvars_supp.end() )
+                       if (MapItr != chanvars_supp.end() )
                                chanvars_supp.erase(MapItr);
                }
        }

diff --git a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
index b05239539dfe9e0022592da624870e75a11818f5..92574a3fa4b7b7fd28220929a0a07b47012357b3 100644 (file)
--- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
+++ b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
@@ -64,7 +64,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address)
        char *next, *cur;
        uint32_t count = 0;
        uint8_t custom = 0;
-       switch_ssize_t hlen = SWITCH_HASH_KEY_STRING;
+       switch_ssize_t hlen = -1;
 
        gethostname(globals.hostname, sizeof(globals.hostname));
        globals.host_hash = switch_hashfunc_default(globals.hostname, &hlen);
@@ -107,7 +107,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address)
                        }
 
                        if (custom) {
-                               switch_core_hash_insert_dup(globals.event_hash, cur, MARKER);
+                               switch_core_hash_insert(globals.event_hash, cur, MARKER);
                        } else if (switch_name_event(cur, &type) == SWITCH_STATUS_SUCCESS) {
                                globals.key_count++;
                                if (type == SWITCH_EVENT_ALL) {

diff --git a/src/switch.c b/src/switch.c
index 7a8b43bbaa0d184861676712b07506863f9bcc9e..e27c20cebc1c8e339d3f7970a4ca2bf64dcd114b 100644 (file)
--- a/src/switch.c
+++ b/src/switch.c
@@ -166,6 +166,7 @@ void WINAPI ServiceCtrlHandler(DWORD control)
 /* the main service entry point */
 void WINAPI service_main(DWORD numArgs, char **args)
 {
+       switch_core_flag_t flags = SCF_USE_SQL;
        const char *err = NULL;         /* error value for return from freeswitch initialization */
        /*  we have to initialize the service-specific stuff */
        memset(&status, 0, sizeof(SERVICE_STATUS));
@@ -183,7 +184,7 @@ void WINAPI service_main(DWORD numArgs, char **args)
        set_high_priority();
 
        /* attempt to initialize freeswitch and load modules */
-       if (switch_core_init_and_modload(lfile, &err) != SWITCH_STATUS_SUCCESS) {
+       if (switch_core_init_and_modload(lfile, flags, &err) != SWITCH_STATUS_SUCCESS) {
                /* freeswitch did not start sucessfully */
                status.dwCurrentState = SERVICE_STOPPED;
        } else {

diff --git a/src/switch_channel.c b/src/switch_channel.c
index c7ed7966ecf5904384d05f349b26604336b1d48b..a4d8f675a2928d060a63188b5b865e1f0578f729 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -349,8 +349,6 @@ SWITCH_DECLARE(void) switch_channel_variable_last(switch_channel_t *channel)
 
 SWITCH_DECLARE(switch_event_header_t *) switch_channel_variable_first(switch_channel_t *channel)
 {
-       switch_event_header_t *hi;
-
        assert(channel != NULL);
        if (channel->vi) {
                return NULL;
@@ -359,8 +357,6 @@ SWITCH_DECLARE(switch_event_header_t *) switch_channel_variable_first(switch_cha
        switch_mutex_lock(channel->profile_mutex);
        channel->vi = 1;
        return channel->variables->headers;
-       
-       return hi;
 
 }
 

diff --git a/src/switch_core_hash.c b/src/switch_core_hash.c
index c9902826fe773cdfb4999b8dcde38e1992197582..744aa7f7592639ec457b84ed62cc307a17e049c1 100644 (file)
--- a/src/switch_core_hash.c
+++ b/src/switch_core_hash.c
@@ -66,7 +66,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_destroy(switch_hash_t **hash)
 
 SWITCH_DECLARE(switch_status_t) switch_core_hash_insert(switch_hash_t * hash, const char *key, const void *data)
 {
-       sqlite3HashInsert(&hash->table, key, strlen(key)+1, (void *)data);
+       sqlite3HashInsert(&hash->table, key, (int)strlen(key)+1, (void *)data);
        return SWITCH_STATUS_SUCCESS;
 }
 
@@ -76,7 +76,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_locked(switch_hash_t * h
         switch_mutex_lock(mutex);
     }
 
-       sqlite3HashInsert(&hash->table, key, strlen(key)+1, (void *)data);
+       sqlite3HashInsert(&hash->table, key, (int)strlen(key)+1, (void *)data);
 
        if (mutex) {
         switch_mutex_unlock(mutex);
@@ -87,7 +87,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_locked(switch_hash_t * h
 
 SWITCH_DECLARE(switch_status_t) switch_core_hash_delete(switch_hash_t * hash, const char *key)
 {
-       sqlite3HashInsert(&hash->table, key, strlen(key)+1, NULL);
+       sqlite3HashInsert(&hash->table, key, (int)strlen(key)+1, NULL);
        return SWITCH_STATUS_SUCCESS;
 }
 
@@ -97,7 +97,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(switch_hash_t * h
         switch_mutex_lock(mutex);
     }
        
-       sqlite3HashInsert(&hash->table, key, strlen(key)+1, NULL);
+       sqlite3HashInsert(&hash->table, key, (int)strlen(key)+1, NULL);
        
        if (mutex) {
         switch_mutex_unlock(mutex);
@@ -109,7 +109,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(switch_hash_t * h
 
 SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t * hash, const char *key)
 {
-       return sqlite3HashFind(&hash->table, key, strlen(key)+1);
+       return sqlite3HashFind(&hash->table, key, (int)strlen(key)+1);
 }
 
 SWITCH_DECLARE(void *) switch_core_hash_find_locked(switch_hash_t * hash, const char *key, switch_mutex_t *mutex)
@@ -120,7 +120,7 @@ SWITCH_DECLARE(void *) switch_core_hash_find_locked(switch_hash_t * hash, const
                switch_mutex_lock(mutex);
        }
 
-       val = sqlite3HashFind(&hash->table, key, strlen(key)+1);
+       val = sqlite3HashFind(&hash->table, key, (int)strlen(key)+1);
        
        if (mutex) {
                switch_mutex_unlock(mutex);