kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backport GCC 4.2 fixes. Without these Asterisk won't build under devmode using GCC 4.2.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@75712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-07-18 20:00:23 +00:00
parent 7d9778c9f8
commit 6d143d401f
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/app_voicemail.c
+3 -6
View File
@@ -553,12 +553,9 @@ static void populate_defaults(struct ast_vm_user *vmu)
ast_copy_flags(vmu, (&globalflags), AST_FLAGS_ALL);
if (saydurationminfo)
vmu->saydurationm = saydurationminfo;
if (callcontext)
ast_copy_string(vmu->callback, callcontext, sizeof(vmu->callback));
if (dialcontext)
ast_copy_string(vmu->dialout, dialcontext, sizeof(vmu->dialout));
if (exitcontext)
ast_copy_string(vmu->exit, exitcontext, sizeof(vmu->exit));
ast_copy_string(vmu->callback, callcontext, sizeof(vmu->callback));
ast_copy_string(vmu->dialout, dialcontext, sizeof(vmu->dialout));
ast_copy_string(vmu->exit, exitcontext, sizeof(vmu->exit));
if (maxmsg)
vmu->maxmsg = maxmsg;
vmu->volgain = volgain;
channels/chan_agent.c
+2 -2
View File
@@ -411,10 +411,10 @@ static int __agent_start_monitoring(struct ast_channel *ast, struct agent_pvt *p
/* substitute . for - */
if ((pointer = strchr(filename, '.')))
*pointer = '-';
snprintf(tmp, sizeof(tmp), "%s%s",savecallsin ? savecallsin : "", filename);
snprintf(tmp, sizeof(tmp), "%s%s", savecallsin, filename);
ast_monitor_start(ast, recordformat, tmp, needlock);
ast_monitor_setjoinfiles(ast, 1);
snprintf(tmp2, sizeof(tmp2), "%s%s.%s", urlprefix ? urlprefix : "", filename, recordformatext);
snprintf(tmp2, sizeof(tmp2), "%s%s.%s", urlprefix, filename, recordformatext);
#if 0
ast_verbose("name is %s, link is %s\n",tmp, tmp2);
#endif
channels/chan_sip.c
+1 -1
View File
@@ -4553,7 +4553,7 @@ static int sip_register(char *value, int lineno)
regobjs++;
ASTOBJ_INIT(reg);
ast_string_field_set(reg, contact, contact);
if (username)
if (!ast_strlen_zero(username))
ast_string_field_set(reg, username, username);
if (hostname)
ast_string_field_set(reg, hostname, hostname);
pbx/pbx_realtime.c
+1 -1
View File
@@ -211,7 +211,7 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch
"Application: %s\r\n"
"AppData: %s\r\n"
"Uniqueid: %s\r\n",
chan->name, chan->context, chan->exten, chan->priority, app, appdata ? appdata : "(NULL)", chan->uniqueid);
chan->name, chan->context, chan->exten, chan->priority, app, !ast_strlen_zero(appdata) ? appdata : "(NULL)", chan->uniqueid);
res = pbx_exec(chan, a, appdata);
} else