[svn-commits] kpfleming: branch 1.6.2 r209816 - in /branches/1.6.2: ./ channels/misdn/ main...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jul 31 20:34:49 CDT 2009
Author: kpfleming
Date: Fri Jul 31 20:34:45 2009
New Revision: 209816
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209816
Log:
Merged revisions 209760-209761 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r209760 | kpfleming | 2009-07-31 20:03:07 -0500 (Fri, 31 Jul 2009) | 13 lines
Merged revisions 209759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines
Minor changes inspired by testing with latest GCC.
The latest GCC (what will become 4.5.x) has a few new warnings, that in these
cases found some either downright buggy code, or at least seriously poorly
designed code that could be improved.
........
................
r209761 | kpfleming | 2009-07-31 20:04:06 -0500 (Fri, 31 Jul 2009) | 1 line
Revert accidental Makefile change.
................
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/channels/misdn/ie.c
branches/1.6.2/channels/misdn/isdn_lib.c
branches/1.6.2/main/Makefile
branches/1.6.2/main/pbx.c
branches/1.6.2/pbx/pbx_config.c
branches/1.6.2/utils/frame.c
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/channels/misdn/ie.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/misdn/ie.c?view=diff&rev=209816&r1=209815&r2=209816
==============================================================================
--- branches/1.6.2/channels/misdn/ie.c (original)
+++ branches/1.6.2/channels/misdn/ie.c Fri Jul 31 20:34:45 2009
@@ -248,7 +248,7 @@
if (p[0] <= octet)
goto done;
- if (!p[octet++] & 0x80)
+ if (~p[octet++] & 0x80)
goto l2;
/* Wheee. V.110 speed information */
Modified: branches/1.6.2/channels/misdn/isdn_lib.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/misdn/isdn_lib.c?view=diff&rev=209816&r1=209815&r2=209816
==============================================================================
--- branches/1.6.2/channels/misdn/isdn_lib.c (original)
+++ branches/1.6.2/channels/misdn/isdn_lib.c Fri Jul 31 20:34:45 2009
@@ -1932,9 +1932,7 @@
case CC_SETUP|INDICATION:
{
struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1, 0);
- if (!bc)
- ERR_NO_CHANNEL:
- {
+ if (!bc) {
msg_t *dmsg;
cb_log(4, stack->port, "Patch from MEIDANIS:Sending RELEASE_COMPLETE %x (No free Chan for you..)\n", hh->dinfo);
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST,MT_RELEASE_COMPLETE, hh->dinfo,sizeof(RELEASE_COMPLETE_t), 1);
@@ -2131,8 +2129,15 @@
if (bc->channel<=0 || bc->channel==0xff)
bc->channel=0;
- if (find_free_chan_in_stack(stack,bc, bc->channel,0)<0)
- goto ERR_NO_CHANNEL;
+ if (find_free_chan_in_stack(stack,bc, bc->channel,0)<0) {
+ msg_t *dmsg;
+ cb_log(4, stack->port, "Patch from MEIDANIS:Sending RELEASE_COMPLETE %x (No free Chan for you..)\n", hh->dinfo);
+ dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST,MT_RELEASE_COMPLETE, hh->dinfo,sizeof(RELEASE_COMPLETE_t), 1);
+ pthread_mutex_lock(&stack->nstlock);
+ stack->nst.manager_l3(&stack->nst, dmsg);
+ free_msg(msg);
+ return 0;
+ }
break;
case EVENT_RELEASE:
case EVENT_RELEASE_COMPLETE:
Modified: branches/1.6.2/main/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/Makefile?view=diff&rev=209816&r1=209815&r2=209816
==============================================================================
--- branches/1.6.2/main/Makefile (original)
+++ branches/1.6.2/main/Makefile Fri Jul 31 20:34:45 2009
@@ -110,7 +110,7 @@
$(MAKE) -C editline libedit.a
db1-ast/libdb1.a: CHECK_SUBDIR
- CFLAGS="$(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
+ _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
ast_expr2.c ast_expr2.h:
bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
Modified: branches/1.6.2/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/pbx.c?view=diff&rev=209816&r1=209815&r2=209816
==============================================================================
--- branches/1.6.2/main/pbx.c (original)
+++ branches/1.6.2/main/pbx.c Fri Jul 31 20:34:45 2009
@@ -1345,7 +1345,7 @@
"the pipe. Did you forget to convert your dialplan? (%s(%s))\n",
app->name, (char *) data);
}
- res = app->execute(c, S_OR(data, ""));
+ res = app->execute(c, S_OR((char *) data, ""));
if (app->module && u)
__ast_module_user_remove(app->module, u);
/* restore channel values */
Modified: branches/1.6.2/pbx/pbx_config.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/pbx/pbx_config.c?view=diff&rev=209816&r1=209815&r2=209816
==============================================================================
--- branches/1.6.2/pbx/pbx_config.c (original)
+++ branches/1.6.2/pbx/pbx_config.c Fri Jul 31 20:34:45 2009
@@ -1441,7 +1441,7 @@
goto process_extension;
}
} else if (!strcasecmp(v->name, "exten")) {
- int ipri = -2;
+ int ipri;
char *plus, *firstp;
char *pri, *appl, *data, *cidmatch;
@@ -1453,6 +1453,7 @@
pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext) - 1);
ast_copy_string(lastextension, realext, sizeof(lastextension));
process_extension:
+ ipri = -2;
if ((cidmatch = strchr(realext, '/'))) {
*cidmatch++ = '\0';
ast_shrink_phone_number(cidmatch);
Modified: branches/1.6.2/utils/frame.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/utils/frame.c?view=diff&rev=209816&r1=209815&r2=209816
==============================================================================
--- branches/1.6.2/utils/frame.c (original)
+++ branches/1.6.2/utils/frame.c Fri Jul 31 20:34:45 2009
@@ -744,7 +744,7 @@
void parseargs( int argcount, char *args[], int fileswitch)
{
char *filename;
- int tempint;
+ int tempint = 0;
if ((fileswitch & 1) != 0) /* If getting infile */
in = NULL;
More information about the svn-commits
mailing list