retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' of fs-git:freeswitch

This commit is contained in:
Raymond Chandler 2013-05-08 12:53:40 -04:00
parent e88126c95a 9aaaeb7215
commit ef1d9836a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/switch_ivr_originate.c
View File

@ -2065,7 +2065,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
goto done;
}
if ((flags & SOF_NOBLOCK) && var_event && (var = switch_event_get_header(var_event, "originate_delay_start"))) {
if (!(flags & SOF_NOBLOCK) && var_event && (var = switch_event_get_header(var_event, "originate_delay_start"))) {
int tmp = atoi(var);
if (tmp > 0) {
while (tmp && (!cancel_cause || *cancel_cause == 0)) {

2
src/switch_xml.c
View File

@ -1982,7 +1982,7 @@ static void switch_xml_user_cache(const char *key, const char *user_name, const
}
if (expires) {
char *expires_val = malloc(1024);
if (sprintf(expires_val, "%ld", expires)) {
if (sprintf(expires_val, "%ld", (long)expires)) {
switch_core_hash_insert(CACHE_EXPIRES_HASH, mega_key, expires_val);
}
}