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.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@208754 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 14db61147a78fe7a95d28dfc009924f484f062dc..0821b40414ec0a011e2a3ed75b5cd09bd06b5248 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4110,7 +4110,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
                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;
        }

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 5f649fbd1ab5faa64ada77cddb98168d4dde269f..67fefbad90d745a14fe75af83649685f624540cd 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -5887,6 +5887,7 @@ static int get_input(struct skinnysession *s)
 {
        int res;
        int dlen = 0;
+       int *bufaddr;
        struct pollfd fds[1];
 
        fds[0].fd = s->fd;
@@ -5933,7 +5934,8 @@ static int get_input(struct skinnysession *s)
                        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 @@ static int get_input(struct skinnysession *s)
                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 int get_input(struct skinnysession *s)
 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);
 

diff --git a/main/translate.c b/main/translate.c
index 05aeaacea4cc5daae4d70ae5f2172b862190b36d..3f092d9948ac0a312e3d10048362ca2aadeb63a2 100644 (file)
--- a/main/translate.c
+++ b/main/translate.c
@@ -855,7 +855,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
           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 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
           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