[asterisk-commits] kpfleming: branch 1.4 r107464 - in /branches/1.4: channels/ channels/misdn/ c...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Mar 11 09:53:03 2008
New Revision: 107464

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107464
Log:
fix various other problems found by gcc 4.3

Modified:
    branches/1.4/channels/chan_misdn.c
    branches/1.4/channels/misdn/isdn_lib.c
    branches/1.4/codecs/Makefile

Modified: branches/1.4/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_misdn.c?view=diff&rev=107464&r1=107463&r2=107464
==============================================================================
--- branches/1.4/channels/chan_misdn.c (original)
+++ branches/1.4/channels/chan_misdn.c Tue Mar 11 09:53:03 2008
@@ -2008,13 +2008,9 @@
 	struct chan_list *ch=MISDN_ASTERISK_TECH_PVT(ast);
 	struct misdn_bchannel *newbc;
 	char *opts=NULL, *ext;
-	char dest_cp[256];
 
 	{
-		strncpy(dest_cp,dest,sizeof(dest_cp)-1);
-		dest_cp[sizeof(dest_cp)]=0;
-
-		ext=dest_cp;
+		ext = ast_strdupa(dest);
 		strsep(&ext,"/");
 		if (ext) {
 			opts=ext;

Modified: branches/1.4/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/misdn/isdn_lib.c?view=diff&rev=107464&r1=107463&r2=107464
==============================================================================
--- branches/1.4/channels/misdn/isdn_lib.c (original)
+++ branches/1.4/channels/misdn/isdn_lib.c Tue Mar 11 09:53:03 2008
@@ -2407,12 +2407,12 @@
     
 	case PH_CONTROL|INDICATION:
 	{
-		unsigned int cont = *((unsigned int *)&frm->data.p);
+		unsigned int *cont = (unsigned int *) &frm->data.p;
 		
 		cb_log(4, stack->port, "PH_CONTROL: channel:%d oad%d:%s dad%d:%s \n", bc->channel, bc->onumplan,bc->oad, bc->dnumplan,bc->dad);
 
-		if ((cont&~DTMF_TONE_MASK) == DTMF_TONE_VAL) {
-			int dtmf = cont & DTMF_TONE_MASK;
+		if ((*cont & ~DTMF_TONE_MASK) == DTMF_TONE_VAL) {
+			int dtmf = *cont & DTMF_TONE_MASK;
 			cb_log(4, stack->port, " --> DTMF TONE: %c\n",dtmf);
 			bc->dtmf=dtmf;
 			cb_event(EVENT_DTMF_TONE, bc, glob_mgr->user_data);
@@ -2420,12 +2420,12 @@
 			free_msg(msg);
 			return 1;
 		}
-		if (cont == BF_REJECT) {
+		if (*cont == BF_REJECT) {
 			cb_log(4, stack->port, " --> BF REJECT\n");
 			free_msg(msg);
 			return 1;
 		}
-		if (cont == BF_ACCEPT) {
+		if (*cont == BF_ACCEPT) {
 			cb_log(4, stack->port, " --> BF ACCEPT\n");
 			free_msg(msg);
 			return 1;

Modified: branches/1.4/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/codecs/Makefile?view=diff&rev=107464&r1=107463&r2=107464
==============================================================================
--- branches/1.4/codecs/Makefile (original)
+++ branches/1.4/codecs/Makefile Tue Mar 11 09:53:03 2008
@@ -56,6 +56,6 @@
 $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10)
 
 $(LIBILBC):
-	@$(MAKE) -C ilbc all
+	@$(MAKE) -C ilbc all ASTCFLAGS="$(ASTCFLAGS) $(AST_NO_STRICT_OVERFLOW)"
 
 $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC)