From 0cad342de77befaf4cb4b29603d3414c6d6dc36e Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Sat, 1 Aug 2009 01:34:45 +0000
Subject: [PATCH] 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.
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@209816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/misdn/ie.c       |  2 +-
 channels/misdn/isdn_lib.c | 15 ++++++++++-----
 main/Makefile             |  2 +-
 main/pbx.c                |  2 +-
 pbx/pbx_config.c          |  3 ++-
 utils/frame.c             |  2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c
index dc9802845b..cd88db92c1 100644
--- a/channels/misdn/ie.c
+++ b/channels/misdn/ie.c
@@ -248,7 +248,7 @@ static void dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *c
 		if (p[0] <= octet)
 			goto done;
 		
-		if (!p[octet++] & 0x80)
+		if (~p[octet++] & 0x80)
 			goto l2;
 
 		/* Wheee. V.110 speed information */
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index d85a4e4acc..88fde346fe 100644
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -1932,9 +1932,7 @@ handle_event_nt(void *dat, void *arg)
 		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 @@ handle_event_nt(void *dat, void *arg)
 					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:
diff --git a/main/Makefile b/main/Makefile
index 17aa6e1735..53c83a0abd 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -110,7 +110,7 @@ editline/libedit.a: CHECK_SUBDIR
 	$(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
diff --git a/main/pbx.c b/main/pbx.c
index a85105d64e..ed1084886a 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -1345,7 +1345,7 @@ int pbx_exec(struct ast_channel *c, /*!< Channel */
 			"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 */
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 093d77129c..7f07549a69 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1441,7 +1441,7 @@ static int pbx_load_config(const char *config_file)
 					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 @@ static int pbx_load_config(const char *config_file)
 				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);
diff --git a/utils/frame.c b/utils/frame.c
index abc3a30005..2900cb0656 100644
--- a/utils/frame.c
+++ b/utils/frame.c
@@ -744,7 +744,7 @@ void checknoargs( int argcount, char *args[])
 void parseargs( int argcount, char *args[], int fileswitch)
 {
    char *filename;
-   int tempint;
+   int tempint = 0;
 
    if ((fileswitch & 1) != 0)     /* If getting infile  */
      in = NULL;