[asterisk-commits] kpfleming: branch 1.6.0 r107467 - in /branches/1.6.0: ./ apps/ channels/misdn...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Mar 11 10:13:54 2008
New Revision: 107467

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107467
Log:
Merged revisions 107466 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r107466 | kpfleming | 2008-03-11 10:13:38 -0500 (Tue, 11 Mar 2008) | 10 lines

Merged revisions 107464 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107464 | kpfleming | 2008-03-11 09:53:03 -0500 (Tue, 11 Mar 2008) | 2 lines

fix various other problems found by gcc 4.3

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_rpt.c
    branches/1.6.0/apps/app_sms.c
    branches/1.6.0/channels/misdn/isdn_lib.c
    branches/1.6.0/codecs/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_rpt.c?view=diff&rev=107467&r1=107466&r2=107467
==============================================================================
--- branches/1.6.0/apps/app_rpt.c (original)
+++ branches/1.6.0/apps/app_rpt.c Tue Mar 11 10:13:54 2008
@@ -888,12 +888,8 @@
 		ast_free(rpt_vars[n].p.tailmsgbuf);
 	memset(&rpt_vars[n].p, 0, sizeof(rpt_vars[n].p));
 	if (init) {
-		char *cp;
-		int savearea = (char *)&rpt_vars[n].p - (char *)&rpt_vars[n];
-
-		cp = (char *) &rpt_vars[n].p;
-		memset(cp + sizeof(rpt_vars[n].p), 0,
-			sizeof(rpt_vars[n]) - (sizeof(rpt_vars[n].p) + savearea));
+		/* clear all the fields in the structure after 'p' */
+		memset(&rpt_vars[n].p + sizeof(rpt_vars[0].p), 0, sizeof(rpt_vars[0]) - sizeof(rpt_vars[0].p) - offsetof(typeof(rpt_vars[0]), p));
 		rpt_vars[n].tele.next = &rpt_vars[n].tele;
 		rpt_vars[n].tele.prev = &rpt_vars[n].tele;
 		rpt_vars[n].rpt_thread = AST_PTHREADT_NULL;

Modified: branches/1.6.0/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_sms.c?view=diff&rev=107467&r1=107466&r2=107467
==============================================================================
--- branches/1.6.0/apps/app_sms.c (original)
+++ branches/1.6.0/apps/app_sms.c Tue Mar 11 10:13:54 2008
@@ -528,9 +528,10 @@
 }
 
 /*! \brief unpack a date and return */
-static time_t unpackdate(unsigned char *i)
-{
-	struct tm t;
+static struct timeval unpackdate(unsigned char *i)
+{
+	struct ast_tm t;
+
 	t.tm_year = 100 + (i[0] & 0xF) * 10 + (i[0] >> 4);
 	t.tm_mon = (i[1] & 0xF) * 10 + (i[1] >> 4) - 1;
 	t.tm_mday = (i[2] & 0xF) * 10 + (i[2] >> 4);
@@ -542,6 +543,7 @@
 		t.tm_min += 15 * ((i[6] & 0x7) * 10 + (i[6] >> 4));
 	else
 		t.tm_min -= 15 * ((i[6] & 0x7) * 10 + (i[6] >> 4));
+
 	return ast_mktime(&t, NULL);
 }
 
@@ -1058,7 +1060,7 @@
 			p += unpackaddress(h->oa, h->imsg + p);
 			h->pid = h->imsg[p++];
 			h->dcs = h->imsg[p++];
-			h->scts.tv_sec = unpackdate(h->imsg + p);
+			h->scts = unpackdate(h->imsg + p);
 			p += 7;
 			p += unpacksms(h->dcs, h->imsg + p, h->udh, &h->udhl, h->ud, &h->udl, h->udhi);
 			h->rx = 1;				 /* received message */

Modified: branches/1.6.0/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/misdn/isdn_lib.c?view=diff&rev=107467&r1=107466&r2=107467
==============================================================================
--- branches/1.6.0/channels/misdn/isdn_lib.c (original)
+++ branches/1.6.0/channels/misdn/isdn_lib.c Tue Mar 11 10:13:54 2008
@@ -2419,12 +2419,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);
@@ -2432,12 +2432,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.6.0/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/codecs/Makefile?view=diff&rev=107467&r1=107466&r2=107467
==============================================================================
--- branches/1.6.0/codecs/Makefile (original)
+++ branches/1.6.0/codecs/Makefile Tue Mar 11 10:13:54 2008
@@ -46,7 +46,7 @@
 $(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)