[asterisk-commits] jpeeler: branch 1.6.1 r208754 - in /branches/1.6.1: ./ channels/ main/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Sat Jul 25 01:25:30 2009
New Revision: 208754

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=208754
Log:
Merged revisions 208749 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r208749 | jpeeler | 2009-07-25 01:23:18 -0500 (Sat, 25 Jul 2009) | 13 lines
  
  Merged revisions 208746 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r208746 | jpeeler | 2009-07-25 01:19:50 -0500 (Sat, 25 Jul 2009) | 7 lines
    
    Fix compiling under dev-mode with gcc 4.4.0.
    
    Mostly trivial changes, but I did not know of any other way to fix the
    "dereferencing type-punned pointer will break strict-aliasing rules" error
    without creating a tmp variable in chan_skinny.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c
    branches/1.6.1/channels/chan_skinny.c
    branches/1.6.1/main/translate.c

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

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=208754&r1=208753&r2=208754
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Sat Jul 25 01:25:30 2009
@@ -4110,7 +4110,7 @@
 		return AST_BRIDGE_FAILED;
 	}
 	/* Put them in native bridge mode */
-	if (!flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) {
+	if ((!flags) & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) {
 		iaxs[callno0]->bridgecallno = callno1;
 		iaxs[callno1]->bridgecallno = callno0;
 	}

Modified: branches/1.6.1/channels/chan_skinny.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_skinny.c?view=diff&rev=208754&r1=208753&r2=208754
==============================================================================
--- branches/1.6.1/channels/chan_skinny.c (original)
+++ branches/1.6.1/channels/chan_skinny.c Sat Jul 25 01:25:30 2009
@@ -5887,6 +5887,7 @@
 {
 	int res;
 	int dlen = 0;
+	int *bufaddr;
 	struct pollfd fds[1];
 
 	fds[0].fd = s->fd;
@@ -5933,7 +5934,8 @@
 			return -1;
 		}
 
-		dlen = letohl(*(int *)s->inbuf);
+		bufaddr = (int *)s->inbuf;
+		dlen = letohl(*bufaddr);
 		if (dlen < 4) {
 			ast_debug(1, "Skinny Client sent invalid data.\n");
 			ast_mutex_unlock(&s->lock);
@@ -5942,7 +5944,7 @@
 		if (dlen+8 > sizeof(s->inbuf)) {
 			dlen = sizeof(s->inbuf) - 8;
 		}
-		*(int *)s->inbuf = htolel(dlen);
+		*bufaddr = htolel(dlen);
 
 		res = read(s->fd, s->inbuf+4, dlen+4);
 		ast_mutex_unlock(&s->lock);
@@ -5961,13 +5963,15 @@
 static struct skinny_req *skinny_req_parse(struct skinnysession *s)
 {
 	struct skinny_req *req;
+	int *bufaddr;
 
 	if (!(req = ast_calloc(1, SKINNY_MAX_PACKET)))
 		return NULL;
 
 	ast_mutex_lock(&s->lock);
 	memcpy(req, s->inbuf, skinny_header_size);
-	memcpy(&req->data, s->inbuf+skinny_header_size, letohl(*(int*)(s->inbuf))-4);
+	bufaddr = (int *)(s->inbuf);
+	memcpy(&req->data, s->inbuf+skinny_header_size, letohl(*bufaddr)-4);
 
 	ast_mutex_unlock(&s->lock);
 

Modified: branches/1.6.1/main/translate.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/translate.c?view=diff&rev=208754&r1=208753&r2=208754
==============================================================================
--- branches/1.6.1/main/translate.c (original)
+++ branches/1.6.1/main/translate.c Sat Jul 25 01:25:30 2009
@@ -855,7 +855,7 @@
 	   destination format. */
 	for (x = 1; src_audio && (x & AST_FORMAT_AUDIO_MASK); x <<= 1) {
 		/* if this is not a desired format, nothing to do */
-		if (!dest & x)
+		if ((!dest) & x)
 			continue;
 
 		/* if the source is supplying this format, then
@@ -881,7 +881,7 @@
 	   destination format. */
 	for (; src_video && (x & AST_FORMAT_VIDEO_MASK); x <<= 1) {
 		/* if this is not a desired format, nothing to do */
-		if (!dest & x)
+		if ((!dest) & x)
 			continue;
 
 		/* if the source is supplying this format, then