[Freeswitch-svn] [commit] r5767 - in freeswitch/trunk/src: . mod/applications/mod_enum mod/asr_tts/mod_openmrcp mod/event_handlers/mod_cdr mod/event_handlers/mod_event_multicast
Freeswitch SVN
mikej at freeswitch.org
Sun Sep 30 12:59:33 EDT 2007
Author: mikej
Date: Sun Sep 30 12:59:32 2007
New Revision: 5767
Modified:
freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj
freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp
freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
freeswitch/trunk/src/switch.c
freeswitch/trunk/src/switch_channel.c
freeswitch/trunk/src/switch_core_hash.c
Log:
windows build fixes.
Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj (original)
+++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.vcproj Sun Sep 30 12:59:32 2007
@@ -123,6 +123,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\udns""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="2"
Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Sun Sep 30 12:59:32 2007
@@ -916,7 +916,7 @@
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 */
Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp (original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Sun Sep 30 12:59:32 2007
@@ -326,49 +326,43 @@
// 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);
}
}
Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Sun Sep 30 12:59:32 2007
@@ -64,7 +64,7 @@
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 @@
}
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) {
Modified: freeswitch/trunk/src/switch.c
==============================================================================
--- freeswitch/trunk/src/switch.c (original)
+++ freeswitch/trunk/src/switch.c Sun Sep 30 12:59:32 2007
@@ -166,6 +166,7 @@
/* 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 @@
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 {
Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c (original)
+++ freeswitch/trunk/src/switch_channel.c Sun Sep 30 12:59:32 2007
@@ -349,8 +349,6 @@
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_mutex_lock(channel->profile_mutex);
channel->vi = 1;
return channel->variables->headers;
-
- return hi;
}
Modified: freeswitch/trunk/src/switch_core_hash.c
==============================================================================
--- freeswitch/trunk/src/switch_core_hash.c (original)
+++ freeswitch/trunk/src/switch_core_hash.c Sun Sep 30 12:59:32 2007
@@ -66,7 +66,7 @@
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_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_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_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(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_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);
More information about the Freeswitch-svn
mailing list