Changeset 5170 for pjproject/trunk

Timestamp:

Aug 25, 2015 8:45:46 AM (9 years ago)

Author:

nanang

Message:

Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util-test/http_client.c (modified) (7 diffs)
• pjlib-util/src/pjlib-util/cli_telnet.c (modified) (1 diff)
• pjlib-util/src/pjlib-util/resolver.c (modified) (1 diff)
• pjlib-util/src/pjlib-util/srv_resolver.c (modified) (1 diff)
• pjlib-util/src/pjlib-util/stun_simple.c (modified) (2 diffs)
• pjlib/src/pj/errno.c (modified) (1 diff)
• pjlib/src/pj/pool_caching.c (modified) (1 diff)
• pjlib/src/pjlib-test/ioq_perf.c (modified) (1 diff)
• pjlib/src/pjlib-test/ioq_udp.c (modified) (1 diff)
• pjlib/src/pjlib-test/pool.c (modified) (1 diff)
• pjlib/src/pjlib-test/pool_perf.c (modified) (2 diffs)
• pjlib/src/pjlib-test/timer.c (modified) (2 diffs)
• pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c (modified) (5 diffs)
• pjmedia/src/pjmedia/endpoint.c (modified) (3 diffs)
• pjmedia/src/pjmedia/sdp_neg.c (modified) (2 diffs)
• pjmedia/src/pjmedia/tonegen.c (modified) (1 diff)
• pjmedia/src/pjmedia/wav_player.c (modified) (2 diffs)
• pjmedia/src/test/codec_vectors.c (modified) (5 diffs)
• pjmedia/src/test/mips_test.c (modified) (2 diffs)
• pjnath/src/pjnath-test/server.c (modified) (1 diff)
• pjnath/src/pjnath-test/stun.c (modified) (3 diffs)
• pjnath/src/pjnath/ice_session.c (modified) (3 diffs)
• pjnath/src/pjnath/turn_session.c (modified) (3 diffs)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (9 diffs)
• pjsip-apps/src/pjsua/pjsua_app_cli.c (modified) (15 diffs)
• pjsip-apps/src/pjsua/pjsua_app_legacy.c (modified) (14 diffs)
• pjsip-apps/src/samples/clidemo.c (modified) (3 diffs)
• pjsip-apps/src/samples/httpdemo.c (modified) (2 diffs)
• pjsip-apps/src/samples/mix.c (modified) (1 diff)
• pjsip-apps/src/samples/pcaputil.c (modified) (1 diff)
• pjsip-apps/src/samples/pjsip-perf.c (modified) (1 diff)
• pjsip-apps/src/samples/siprtp.c (modified) (2 diffs)
• pjsip-apps/src/samples/stateful_proxy.c (modified) (2 diffs)
• pjsip/src/pjsip-simple/publishc.c (modified) (1 diff)
• pjsip/src/pjsip/sip_dialog.c (modified) (4 diffs)
• pjsip/src/pjsip/sip_multipart.c (modified) (1 diff)
• pjsip/src/pjsip/sip_parser.c (modified) (9 diffs)
• pjsip/src/pjsip/sip_tel_uri.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_tcp.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_dump.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)
• pjsip/src/pjsua2/call.cpp (modified) (1 diff)
• pjsip/src/pjsua2/media.cpp (modified) (1 diff)
• pjsip/src/pjsua2/siptypes.cpp (modified) (1 diff)
• pjsip/src/test/dns_test.c (modified) (4 diffs)
• pjsip/src/test/tsx_uas_test.c (modified) (2 diffs)
• third_party/build/speex/config.h (modified) (1 diff)

pjproject/trunk/pjlib-util/src/pjlib-util-test/http_client.c

@@ -116 +116 @@
             continue;
         } else if (srv->action == ACTION_REPLY) {
-            pj_size_t send_size = 0;
+            pj_size_t send_len = 0;
             unsigned ctr = 0;
             pj_ansi_sprintf(pkt, "HTTP/1.0 200 OK\r\n");
@@ -131 +131 @@
                 continue;
             }
-            while (send_size < srv->data_size) {
-                pkt_len = srv->data_size - send_size;
+            while (send_len < srv->data_size) {
+                pkt_len = srv->data_size - send_len;
                 if (pkt_len > (signed)srv->buf_size)
                     pkt_len = srv->buf_size;
-                send_size += pkt_len;
+                send_len += pkt_len;
                 pj_create_random_string(pkt, pkt_len);
                 pj_ansi_sprintf(pkt, "\nPacket: %d", ++ctr);
@@ -419 +419 @@
 
     {
-        pj_sockaddr_in addr;
-        int addr_len = sizeof(addr);
-        sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len);
+        pj_sockaddr_in addr2;
+        int addr_len = sizeof(addr2);
+        sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len);
         if (sstatus != PJ_SUCCESS)
             return -44;
-        g_server.port = pj_sockaddr_in_get_port(&addr);
+        g_server.port = pj_sockaddr_in_get_port(&addr2);
         pj_ansi_snprintf(urlbuf, sizeof(urlbuf),
                          "http://127.0.0.1:%d/about-us/",
@@ -531 +531 @@
 
     {
-        pj_sockaddr_in addr;
-        int addr_len = sizeof(addr);
-        sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len);
+        pj_sockaddr_in addr2;
+        int addr_len = sizeof(addr2);
+        sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len);
         if (sstatus != PJ_SUCCESS)
             return -44;
-        g_server.port = pj_sockaddr_in_get_port(&addr);
+        g_server.port = pj_sockaddr_in_get_port(&addr2);
         pj_ansi_snprintf(urlbuf, sizeof(urlbuf),
                          "http://127.0.0.1:%d",
@@ -660 +660 @@
 
     {
-        pj_sockaddr_in addr;
-        int addr_len = sizeof(addr);
-        sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len);
+        pj_sockaddr_in addr2;
+        int addr_len = sizeof(addr2);
+        sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len);
         if (sstatus != PJ_SUCCESS)
             return -44;
-        g_server.port = pj_sockaddr_in_get_port(&addr);
+        g_server.port = pj_sockaddr_in_get_port(&addr2);
         pj_ansi_snprintf(urlbuf, sizeof(urlbuf),
                          "http://127.0.0.1:%d/test/test.txt",
@@ -763 +763 @@
 
     {
-        pj_sockaddr_in addr;
-        int addr_len = sizeof(addr);
-        sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len);
+        pj_sockaddr_in addr2;
+        int addr_len = sizeof(addr2);
+        sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len);
         if (sstatus != PJ_SUCCESS)
             return -44;
-        g_server.port = pj_sockaddr_in_get_port(&addr);
+        g_server.port = pj_sockaddr_in_get_port(&addr2);
         pj_ansi_snprintf(urlbuf, sizeof(urlbuf),
                          "http://127.0.0.1:%d/test/test2.txt",
@@ -858 +858 @@
 
     {
-        pj_sockaddr_in addr;
-        int addr_len = sizeof(addr);
-        sstatus = pj_sock_getsockname(g_server.sock, &addr, &addr_len);
+        pj_sockaddr_in addr2;
+        int addr_len = sizeof(addr2);
+        sstatus = pj_sock_getsockname(g_server.sock, &addr2, &addr_len);
         if (sstatus != PJ_SUCCESS)
             return -44;
-        g_server.port = pj_sockaddr_in_get_port(&addr);
+        g_server.port = pj_sockaddr_in_get_port(&addr2);
         pj_ansi_snprintf(urlbuf, sizeof(urlbuf),
                          "http://127.0.0.1:%d/test/test2.txt",

pjproject/trunk/pjlib-util/src/pjlib-util/cli_telnet.c

@@ -37 +37 @@
     (defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0)
 
+/* Undefine EADDRINUSE first, we want it equal to WSAEADDRINUSE,
+ * while WinSDK 10 defines it to another value.
+ */
+#undef EADDRINUSE
 #define EADDRINUSE WSAEADDRINUSE
 

pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

@@ -1634 +1634 @@
     PJ_LOG(3,(resolver->name.ptr, "  Name servers:"));
     for (i=0; i<resolver->ns_count; ++i) {
-        const char *state_names[] = { "probing", "active", "bad"};
         struct nameserver *ns = &resolver->ns[i];
 

pjproject/trunk/pjlib-util/src/pjlib-util/srv_resolver.c

@@ -617 +617 @@
         for (i=0; i<query_job->srv_cnt; ++i) {
             unsigned j;
-            struct srv_target *srv = &query_job->srv[i];
-
-            srv_rec.entry[srv_rec.count].priority = srv->priority;
-            srv_rec.entry[srv_rec.count].weight = srv->weight;
-            srv_rec.entry[srv_rec.count].port = (pj_uint16_t)srv->port ;
-
-            srv_rec.entry[srv_rec.count].server.name = srv->target_name;
-            srv_rec.entry[srv_rec.count].server.alias = srv->cname;
+            struct srv_target *srv2 = &query_job->srv[i];
+
+            srv_rec.entry[srv_rec.count].priority = srv2->priority;
+            srv_rec.entry[srv_rec.count].weight = srv2->weight;
+            srv_rec.entry[srv_rec.count].port = (pj_uint16_t)srv2->port ;
+
+            srv_rec.entry[srv_rec.count].server.name = srv2->target_name;
+            srv_rec.entry[srv_rec.count].server.alias = srv2->cname;
             srv_rec.entry[srv_rec.count].server.addr_count = 0;
 
-            pj_assert(srv->addr_cnt <= PJ_DNS_MAX_IP_IN_A_REC);
-
-            for (j=0; j<srv->addr_cnt; ++j) {
+            pj_assert(srv2->addr_cnt <= PJ_DNS_MAX_IP_IN_A_REC);
+
+            for (j=0; j<srv2->addr_cnt; ++j) {
                 srv_rec.entry[srv_rec.count].server.addr[j].s_addr = 
-                    srv->addr[j].s_addr;
+                    srv2->addr[j].s_addr;
                 ++srv_rec.entry[srv_rec.count].server.addr_count;
             }
 
-            if (srv->addr_cnt > 0) {
+            if (srv2->addr_cnt > 0) {
                 ++srv_rec.count;
                 if (srv_rec.count == PJ_DNS_SRV_MAX_ADDR)

pjproject/trunk/pjlib-util/src/pjlib-util/stun_simple.c

@@ -50 +50 @@
 }
 
-PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t len, 
-                                       pjstun_msg *msg)
+PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, 
+                                      pjstun_msg *msg)
 {
     pj_uint16_t msg_type, msg_len;
@@ -75 +75 @@
 
     msg_len = pj_ntohs(msg->hdr->length);
-    if (msg_len != len - sizeof(pjstun_msg_hdr)) {
+    if (msg_len != buf_len - sizeof(pjstun_msg_hdr)) {
         PJ_LOG(4,(THIS_FILE, "Error: invalid msg_len %d (expecting %d)", 
-                             msg_len, len - sizeof(pjstun_msg_hdr)));
+                             msg_len, buf_len - sizeof(pjstun_msg_hdr)));
         return PJLIB_UTIL_ESTUNINMSGLEN;
     }

pjproject/trunk/pjlib/src/pj/errno.c

@@ -99 +99 @@
     for (i=0; i<sizeof(err_str)/sizeof(err_str[0]); ++i) {
         if (err_str[i].code == code) {
-            pj_size_t len = strlen(err_str[i].msg);
-            if (len >= size) len = size-1;
-            pj_memcpy(buf, err_str[i].msg, len);
-            buf[len] = '\0';
-            return (int)len;
+            pj_size_t len2 = pj_ansi_strlen(err_str[i].msg);
+            if (len2 >= size) len2 = size-1;
+            pj_memcpy(buf, err_str[i].msg, len2);
+            buf[len2] = '\0';
+            return (int)len2;
         }
     }

pjproject/trunk/pjlib/src/pj/pool_caching.c

@@ -91 +91 @@
     /* Delete all pool in free list */
     for (i=0; i < PJ_CACHING_POOL_ARRAY_SIZE; ++i) {
-        pj_pool_t *pool = (pj_pool_t*) cp->free_list[i].next;
         pj_pool_t *next;
+        pool = (pj_pool_t*) cp->free_list[i].next;
         for (; pool != (void*)&cp->free_list[i]; pool = next) {
             next = pool->next;

pjproject/trunk/pjlib/src/pjlib-test/ioq_perf.c

@@ -85 +85 @@
 
         if (bytes_read < 0) {
-            pj_status_t rc = (pj_status_t)-bytes_read;
             char errmsg[PJ_ERR_MSG_SIZE];
 
+            rc = (pj_status_t)-bytes_read;
             if (rc != last_error) {
                 //last_error = rc;

pjproject/trunk/pjlib/src/pjlib-test/ioq_udp.c

@@ -264 +264 @@
     // Poll if pending.
     while (send_pending || recv_pending) {
-        int rc;
+        int ret;
         pj_time_val timeout = { 5, 0 };
 
         TRACE_("poll...");
 #ifdef PJ_SYMBIAN
-        rc = pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
+        ret = pj_symbianos_poll(-1, PJ_TIME_VAL_MSEC(timeout));
 #else
-        rc = pj_ioqueue_poll(ioque, &timeout);
+        ret = pj_ioqueue_poll(ioque, &timeout);
 #endif
 
-        if (rc == 0) {
+        if (ret == 0) {
             PJ_LOG(1,(THIS_FILE, "...ERROR: timed out..."));
             status=-45; goto on_error;
-        } else if (rc < 0) {
-            app_perror("...ERROR in ioqueue_poll()", -rc);
+        } else if (ret < 0) {
+            app_perror("...ERROR in ioqueue_poll()", -ret);
             status=-50; goto on_error;
         }

pjproject/trunk/pjlib/src/pjlib-test/pool.c

@@ -191 +191 @@
     /* Drain the pool until there's nothing left. */
     while (freesize > 0) {
-        int size;
+        int size2;
 
         if (freesize > 255)
-            size = ((pj_rand() & 0x000000FF) + PJ_POOL_ALIGNMENT) & 
+            size2 = ((pj_rand() & 0x000000FF) + PJ_POOL_ALIGNMENT) & 
                    ~(PJ_POOL_ALIGNMENT - 1);
         else
-            size = (int)freesize;
-
-        p = pj_pool_alloc(pool, size);
+            size2 = (int)freesize;
+
+        p = pj_pool_alloc(pool, size2);
         if (!p) {
             status=-20; goto on_error;
         }
 
-        freesize -= size;
+        freesize -= size2;
     }
 

pjproject/trunk/pjlib/src/pjlib-test/pool_perf.c

@@ -48 +48 @@
 
     for (i=0; i<COUNT; ++i) {
-        char *p;
-        if ( (p=(char*)pj_pool_alloc(pool, sizes[i])) == NULL) {
+        char *ptr;
+        if ( (ptr=(char*)pj_pool_alloc(pool, sizes[i])) == NULL) {
             PJ_LOG(3,(THIS_FILE,"   error: pool failed to allocate %d bytes",
                       sizes[i]));
@@ -55 +55 @@
             return -1;
         }
-        *p = '\0';
+        *ptr = '\0';
     }
 

pjproject/trunk/pjlib/src/pjlib-test/timer.c

@@ -59 +59 @@
     pj_timer_heap_t *timer;
     pj_time_val delay;
-    pj_status_t rc;    int err=0;
+    pj_status_t status;
+    int err=0;
     pj_size_t size;
     unsigned count;
@@ -78 +79 @@
         entry[i].cb = &timer_callback;
     }
-    rc = pj_timer_heap_create(pool, MAX_COUNT, &timer);
-    if (rc != PJ_SUCCESS) {
-        app_perror("...error: unable to create timer heap", rc);
+    status = pj_timer_heap_create(pool, MAX_COUNT, &timer);
+    if (status != PJ_SUCCESS) {
+        app_perror("...error: unable to create timer heap", status);
         return -30;
     }

pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c

@@ -37 +37 @@
 };
 
-static void on_read_complete(pj_ioqueue_key_t *key, 
+static void on_read_complete(pj_ioqueue_key_t *ioq_key, 
                              pj_ioqueue_op_key_t *op_key, 
                              pj_ssize_t bytes_received)
@@ -63 +63 @@
                 pj_memcpy(&send_rec->addr, &recv_rec->addr, recv_rec->addrlen);
                 send_rec->addrlen = recv_rec->addrlen;
-                rc = pj_ioqueue_sendto(key, &send_rec->op_key_, 
+                rc = pj_ioqueue_sendto(ioq_key, &send_rec->op_key_,
                                        send_rec->buffer, &sent, 0,
                                        &send_rec->addr, send_rec->addrlen);
@@ -76 +76 @@
         if (!send_rec->is_pending) {
             bytes_received = recv_rec->size;
-            rc = pj_ioqueue_recvfrom(key, &recv_rec->op_key_, 
+            rc = pj_ioqueue_recvfrom(ioq_key, &recv_rec->op_key_,
                                      recv_rec->buffer, &bytes_received, 0,
                                      &recv_rec->addr, &recv_rec->addrlen);
@@ -100 +100 @@
 }
 
-static void on_write_complete(pj_ioqueue_key_t *key, 
+static void on_write_complete(pj_ioqueue_key_t *ioq_key, 
                               pj_ioqueue_op_key_t *op_key, 
                               pj_ssize_t bytes_sent)
@@ -115 +115 @@
 
     send_rec->is_pending = 0;
-    on_read_complete(key, &send_rec->peer->op_key_, 0);
+    on_read_complete(ioq_key, &send_rec->peer->op_key_, 0);
 }
 

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -485 +485 @@
             enum { MAX_FMTP_STR_LEN = 160 };
             char buf[MAX_FMTP_STR_LEN];
-            unsigned buf_len = 0, i;
+            unsigned buf_len = 0, ii;
             pjmedia_codec_fmtp *dec_fmtp = &codec_param.setting.dec_fmtp;
 
@@ -494 +494 @@
                                         codec_info->pt);
 
-            for (i = 0; i < dec_fmtp->cnt; ++i) {
+            for (ii = 0; ii < dec_fmtp->cnt; ++ii) {
                 pj_size_t test_len = 2;
 
                 /* Check if buf still available */
-                test_len = dec_fmtp->param[i].val.slen + 
-                           dec_fmtp->param[i].name.slen + 2;
+                test_len = dec_fmtp->param[ii].val.slen + 
+                           dec_fmtp->param[ii].name.slen + 2;
                 if (test_len + buf_len >= MAX_FMTP_STR_LEN)
                     return PJ_ETOOBIG;
@@ -506 +506 @@
                 buf_len += pj_ansi_snprintf(&buf[buf_len], 
                                             MAX_FMTP_STR_LEN - buf_len,
-                                            (i == 0?" ":";"));
+                                            (ii == 0?" ":";"));
 
                 /* Print an fmtp param */
-                if (dec_fmtp->param[i].name.slen)
+                if (dec_fmtp->param[ii].name.slen)
                     buf_len += pj_ansi_snprintf(
                                             &buf[buf_len],
                                             MAX_FMTP_STR_LEN - buf_len,
                                             "%.*s=%.*s",
-                                            (int)dec_fmtp->param[i].name.slen,
-                                            dec_fmtp->param[i].name.ptr,
-                                            (int)dec_fmtp->param[i].val.slen,
-                                            dec_fmtp->param[i].val.ptr);
+                                            (int)dec_fmtp->param[ii].name.slen,
+                                            dec_fmtp->param[ii].name.ptr,
+                                            (int)dec_fmtp->param[ii].val.slen,
+                                            dec_fmtp->param[ii].val.ptr);
                 else
                     buf_len += pj_ansi_snprintf(&buf[buf_len], 
                                             MAX_FMTP_STR_LEN - buf_len,
                                             "%.*s", 
-                                            (int)dec_fmtp->param[i].val.slen,
-                                            dec_fmtp->param[i].val.ptr);
+                                            (int)dec_fmtp->param[ii].val.slen,
+                                            dec_fmtp->param[ii].val.ptr);
             }
 

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -1177 +1177 @@
                             /* Match! */
                             if (is_codec) {
-                                pjmedia_sdp_media *o, *a;
+                                pjmedia_sdp_media *o_med, *a_med;
                                 unsigned o_fmt_idx, a_fmt_idx;
 
-                                o = (pjmedia_sdp_media*)offer;
-                                a = (pjmedia_sdp_media*)preanswer;
+                                o_med = (pjmedia_sdp_media*)offer;
+                                a_med = (pjmedia_sdp_media*)preanswer;
                                 o_fmt_idx = prefer_remote_codec_order? i:j;
                                 a_fmt_idx = prefer_remote_codec_order? j:i;
@@ -1187 +1187 @@
                                 /* Call custom format matching callbacks */
                                 if (custom_fmt_match(pool, &or_.enc_name,
-                                                     o, o_fmt_idx,
-                                                     a, a_fmt_idx,
+                                                     o_med, o_fmt_idx,
+                                                     a_med, a_fmt_idx,
                                                      ALLOW_MODIFY_ANSWER) !=
                                     PJ_SUCCESS)

pjproject/trunk/pjmedia/src/pjmedia/tonegen.c

@@ -666 +666 @@
                 /* Fade in */
                 short *samp = (dst - cnt);
-                short *end;
+                short *samp_end;
 
                 if (cnt > tonegen->fade_in_len)
                     cnt = tonegen->fade_in_len;
-                end = samp + cnt;
+                samp_end = samp + cnt;
                 if (cnt) {
                     const unsigned step = 0xFFFF / cnt;
                     unsigned scale = 0;
 
-                    for (; samp < end; ++samp) {
+                    for (; samp < samp_end; ++samp) {
                         (*samp) = (short)(((*samp) * scale) >> 16);
                         scale += step;

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -581 +581 @@
     struct file_reader_port *fport = (struct file_reader_port*)this_port;
     pj_size_t frame_size;
-    pj_status_t status;
+    pj_status_t status = PJ_SUCCESS;
 
     pj_assert(fport->base.info.signature == SIGNATURE);
@@ -588 +588 @@
     /* EOF is set and readpos already passed the eofpos */
     if (fport->eof && fport->readpos >= fport->eofpos) {
-        pj_status_t status = PJ_SUCCESS;
-
         PJ_LOG(5,(THIS_FILE, "File port %.*s EOF",
                   (int)fport->base.info.name.slen,

pjproject/trunk/pjmedia/src/test/codec_vectors.c

@@ -160 +160 @@
     pos = 0;
     for (;;) {
-        pj_size_t count;
+        pj_size_t count2;
         
-        count = fread(in_frame.buf, encoded_frame_len, 1, fref);
-        if (count != 1)
+        count2 = fread(in_frame.buf, encoded_frame_len, 1, fref);
+        if (count2 != 1)
             break;
 
-        count = fread(out_frame.buf, encoded_frame_len, 1, output);
-        if (count != 1)
+        count2 = fread(out_frame.buf, encoded_frame_len, 1, output);
+        if (count2 != 1)
             break;
 
@@ -381 +381 @@
         pjmedia_frame in_frame[2];
         pj_timestamp ts;
-        unsigned count;
+        unsigned count2;
         pj_bool_t has_frame;
 
@@ -402 +402 @@
 
         if (has_frame) {
-            count = 2;
+            count2 = 2;
             if (pjmedia_codec_parse(codec, pkt, encoded_len, &ts, 
-                                    &count, in_frame) != PJ_SUCCESS) 
+                                    &count2, in_frame) != PJ_SUCCESS) 
             {
                 rc = -100;
@@ -410 +410 @@
             }
 
-            if (count != 1) {
+            if (count2 != 1) {
                 rc = -110;
                 goto on_return;
@@ -460 +460 @@
     pos = 0;
     for (;;) {
-        pj_size_t count;
+        pj_size_t count2;
         
-        count = fread(pkt, samples_per_frame*2, 1, fref);
-        if (count != 1)
+        count2 = fread(pkt, samples_per_frame*2, 1, fref);
+        if (count2 != 1)
             break;
 
-        count = fread(out_frame.buf, samples_per_frame*2, 1, output);
-        if (count != 1)
+        count2 = fread(out_frame.buf, samples_per_frame*2, 1, output);
+        if (count2 != 1)
             break;
 

pjproject/trunk/pjmedia/src/test/mips_test.c

@@ -2491 +2491 @@
     };
 
-    unsigned i, c, k[3] = {K8, K16, K32}, clock_rates[3] = {8000, 16000, 32000};
+    unsigned i, c, clks[3] = {K8, K16, K32}, clock_rates[3] = {8000, 16000, 32000};
 
     PJ_LOG(3,(THIS_FILE, "MIPS test, with CPU=%dMhz, %6.1f MIPS", CPU_MHZ, CPU_IPS / 1000000));
@@ -2510 +2510 @@
             unsigned j, clock_rate = clock_rates[c];
 
-            if ((e->valid_clock_rate & k[c]) == 0)
+            if ((e->valid_clock_rate & clks[c]) == 0)
                 continue;
 

pjproject/trunk/pjnath/src/pjnath-test/server.c

@@ -425 +425 @@
         pj_stun_username_attr *uname;
         pj_activesock_cb alloc_sock_cb;
-        turn_allocation *alloc;
+        ///turn_allocation *alloc;
 
         /* Must be Allocate request */

pjproject/trunk/pjnath/src/pjnath-test/stun.c

@@ -693 +693 @@
             if (PJ_STUN_IS_REQUEST(msg->hdr.type)) {
                 pj_stun_auth_cred cred;
-                pj_status_t status;
+                pj_status_t status2;
 
                 pj_bzero(&cred, sizeof(cred));
@@ -702 +702 @@
                 cred.data.static_cred.nonce = pj_str(v->nonce);
 
-                status = pj_stun_authenticate_request(buf, (unsigned)len, msg, 
+                status2 = pj_stun_authenticate_request(buf, (unsigned)len, msg, 
                                                       &cred, pool, NULL, NULL);
-                if (status != PJ_SUCCESS) {
+                if (status2 != PJ_SUCCESS) {
                     char errmsg[PJ_ERR_MSG_SIZE];
-                    pj_strerror(status, errmsg, sizeof(errmsg));
+                    pj_strerror(status2, errmsg, sizeof(errmsg));
                     PJ_LOG(1,(THIS_FILE, 
                               "    Request authentication failed: %s",
@@ -715 +715 @@
 
             } else if (PJ_STUN_IS_RESPONSE(msg->hdr.type)) {
-                pj_status_t status;
-                status = pj_stun_authenticate_response(buf, (unsigned)len, 
+                pj_status_t status2;
+                status2 = pj_stun_authenticate_response(buf, (unsigned)len, 
                                                        msg, &key);
-                if (status != PJ_SUCCESS) {
+                if (status2 != PJ_SUCCESS) {
                     char errmsg[PJ_ERR_MSG_SIZE];
-                    pj_strerror(status, errmsg, sizeof(errmsg));
+                    pj_strerror(status2, errmsg, sizeof(errmsg));
                     PJ_LOG(1,(THIS_FILE, 
                               "    Response authentication failed: %s",

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -1601 +1601 @@
                               const pj_str_t *rem_ufrag,
                               const pj_str_t *rem_passwd,
-                              unsigned rcand_cnt,
-                              const pj_ice_sess_cand rcand[])
+                              unsigned rem_cand_cnt,
+                              const pj_ice_sess_cand rem_cand[])
 {
     pj_ice_sess_checklist *clist;
@@ -1612 +1612 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(ice && rem_ufrag && rem_passwd && rcand_cnt && rcand,
-                     PJ_EINVAL);
-    PJ_ASSERT_RETURN(rcand_cnt + ice->rcand_cnt <= PJ_ICE_MAX_CAND, 
+    PJ_ASSERT_RETURN(ice && rem_ufrag && rem_passwd && rem_cand_cnt &&
+                     rem_cand, PJ_EINVAL);
+    PJ_ASSERT_RETURN(rem_cand_cnt + ice->rcand_cnt <= PJ_ICE_MAX_CAND,
                      PJ_ETOOMANY);
 
@@ -1639 +1639 @@
     /* Save remote candidates */
     ice->rcand_cnt = 0;
-    for (i=0; i<rcand_cnt; ++i) {
+    for (i=0; i<rem_cand_cnt; ++i) {
         pj_ice_sess_cand *cn = &ice->rcand[ice->rcand_cnt];
 
         /* Ignore candidate which has no matching component ID */
-        if (rcand[i].comp_id==0 || rcand[i].comp_id > ice->comp_cnt) {
+        if (rem_cand[i].comp_id==0 || rem_cand[i].comp_id > ice->comp_cnt) {
             continue;
         }
 
-        if (rcand[i].comp_id > highest_comp)
-            highest_comp = rcand[i].comp_id;
-
-        pj_memcpy(cn, &rcand[i], sizeof(pj_ice_sess_cand));
-        pj_strdup(ice->pool, &cn->foundation, &rcand[i].foundation);
+        if (rem_cand[i].comp_id > highest_comp)
+            highest_comp = rem_cand[i].comp_id;
+
+        pj_memcpy(cn, &rem_cand[i], sizeof(pj_ice_sess_cand));
+        pj_strdup(ice->pool, &cn->foundation, &rem_cand[i].foundation);
         ice->rcand_cnt++;
     }

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -1292 +1292 @@
     const pj_stun_sockaddr_attr *mapped_attr;
     pj_str_t s;
-    pj_time_val timeout;
 
     /* Must have LIFETIME attribute */
@@ -1397 +1396 @@
     /* Start keep-alive timer once allocation succeeds */
     if (sess->state < PJ_TURN_STATE_DEALLOCATING) {
+        pj_time_val timeout;
         timeout.sec = sess->ka_interval;
         timeout.msec = 0;
@@ -1772 +1772 @@
 
         if (bind_channel) {
-            pj_uint32_t hval = 0;
+            pj_uint32_t hval2 = 0;
             /* Register by channel number */
             pj_assert(ch->num != PJ_TURN_INVALID_CHANNEL && ch->bound);
 
             if (pj_hash_get(sess->ch_table, &ch->num, 
-                            sizeof(ch->num), &hval)==0) {
+                            sizeof(ch->num), &hval2)==0) {
                 pj_hash_set(sess->pool, sess->ch_table, &ch->num,
-                            sizeof(ch->num), hval, ch);
+                            sizeof(ch->num), hval2, ch);
             }
         }

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -139 +139 @@
 {
     pjsua_call_id call_id = entry->id;
-    pjsua_msg_data msg_data;
+    pjsua_msg_data msg_data_;
     pjsip_generic_string_hdr warn;
     pj_str_t hname = pj_str("Warning");
@@ -152 +152 @@
     
     /* Add warning header */
-    pjsua_msg_data_init(&msg_data);
+    pjsua_msg_data_init(&msg_data_);
     pjsip_generic_string_hdr_init2(&warn, &hname, &hvalue);
-    pj_list_push_back(&msg_data.hdr_list, &warn);
+    pj_list_push_back(&msg_data_.hdr_list, &warn);
 
     /* Call duration has been exceeded; disconnect the call */
@@ -161 +161 @@
                          app_config.duration, call_id));
     entry->id = PJSUA_INVALID_ID;
-    pjsua_call_hangup(call_id, 200, NULL, &msg_data);
+    pjsua_call_hangup(call_id, 200, NULL, &msg_data_);
 }
 
@@ -294 +294 @@
     
     if (app_config.auto_answer > 0) {
-        pjsua_call_setting call_opt;
-
-        pjsua_call_setting_default(&call_opt);
-        call_opt.aud_cnt = app_config.aud_cnt;
-        call_opt.vid_cnt = app_config.vid.vid_cnt;
-
-        pjsua_call_answer2(call_id, &call_opt, app_config.auto_answer, NULL,
+        pjsua_call_setting opt;
+
+        pjsua_call_setting_default(&opt);
+        opt.aud_cnt = app_config.aud_cnt;
+        opt.vid_cnt = app_config.vid.vid_cnt;
+
+        pjsua_call_answer2(call_id, &opt, app_config.auto_answer, NULL,
                            NULL);
     }
@@ -668 +668 @@
                                   pjsip_status_code *code,
                                   pj_str_t *reason,
-                                  pjsua_msg_data *msg_data)
+                                  pjsua_msg_data *msg_data_)
 {
     /* Just accept the request (the default behavior) */
@@ -678 +678 @@
     PJ_UNUSED_ARG(code);
     PJ_UNUSED_ARG(reason);
-    PJ_UNUSED_ARG(msg_data);
+    PJ_UNUSED_ARG(msg_data_);
 }
 
@@ -1413 +1413 @@
         char name[80];
         pj_str_t label;
-        pj_status_t status;
+        pj_status_t status2;
 
         pj_ansi_snprintf(name, sizeof(name), "tone-%d,%d",
@@ -1419 +1419 @@
                          app_config.tones[i].freq2);
         label = pj_str(name);
-        status = pjmedia_tonegen_create2(app_config.pool, &label,
-                                         8000, 1, 160, 16, 
-                                         PJMEDIA_TONEGEN_LOOP,  &tport);
-        if (status != PJ_SUCCESS) {
+        status2 = pjmedia_tonegen_create2(app_config.pool, &label,
+                                          8000, 1, 160, 16, 
+                                          PJMEDIA_TONEGEN_LOOP,  &tport);
+        if (status2 != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to create tone generator", status);
             goto on_error;
         }
 
-        status = pjsua_conf_add_port(app_config.pool, tport, 
+        status2 = pjsua_conf_add_port(app_config.pool, tport,
                                      &app_config.tone_slots[i]);
-        pj_assert(status == PJ_SUCCESS);
-
-        status = pjmedia_tonegen_play(tport, 1, &app_config.tones[i], 0);
-        pj_assert(status == PJ_SUCCESS);
+        pj_assert(status2 == PJ_SUCCESS);
+
+        status2 = pjmedia_tonegen_play(tport, 1, &app_config.tones[i], 0);
+        pj_assert(status2 == PJ_SUCCESS);
     }
 
@@ -1449 +1449 @@
     /* Create ringback tones */
     if (app_config.no_tones == PJ_FALSE) {
-        unsigned i, samples_per_frame;
+        unsigned samples_per_frame;
         pjmedia_tone_desc tone[RING_CNT+RINGBACK_CNT];
         pj_str_t name;

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c

@@ -1749 +1749 @@
             }
         } else if (result.uri_result) {
-            pj_str_t tmp;
-            tmp = pj_str(result.uri_result);
-            pjsua_call_xfer( current_call, &tmp, &msg_data);
+            pj_str_t tmp2;
+            tmp2 = pj_str(result.uri_result);
+            pjsua_call_xfer( current_call, &tmp2, &msg_data);
         }
     }
@@ -1769 +1769 @@
         pj_str_t STR_FALSE = { "false", 5 };
         pjsua_call_id ids[PJSUA_MAX_CALLS];
-        pjsua_msg_data msg_data;
+        pjsua_msg_data msg_data_;
         char buf[8] = {0};
         pj_str_t tmp = pj_str(buf);
@@ -1823 +1823 @@
         }
 
-        pjsua_msg_data_init(&msg_data);
+        pjsua_msg_data_init(&msg_data_);
         if (app_config.no_refersub) {
             /* Add Refer-Sub: false in outgoing REFER request */
             pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB,
                                            &STR_FALSE);
-            pj_list_push_back(&msg_data.hdr_list, &refer_sub);
+            pj_list_push_back(&msg_data_.hdr_list, &refer_sub);
         }
 
         pjsua_call_xfer_replaces(call, dst_call,
                                  PJSUA_XFER_NO_REQUIRE_REPLACES,
-                                 &msg_data);
+                                 &msg_data_);
     }
     return PJ_SUCCESS;
@@ -2662 +2662 @@
 }
 
-static pj_status_t add_call_command(pj_cli_t *cli)
+static pj_status_t add_call_command(pj_cli_t *c)
 {
     char* call_command =
@@ -2734 +2734 @@
 
     pj_str_t xml = pj_str(call_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL,
+    return pj_cli_add_cmd_from_xml(c, NULL,
                                    &xml, cmd_call_handler,
                                    NULL, get_choice_value);
 }
 
-static pj_status_t add_presence_command(pj_cli_t *cli)
+static pj_status_t add_presence_command(pj_cli_t *c)
 {
     char* presence_command =
@@ -2790 +2790 @@
     pj_str_t xml = pj_str(presence_command);
 
-    return pj_cli_add_cmd_from_xml(cli, NULL,
+    return pj_cli_add_cmd_from_xml(c, NULL,
                                    &xml, cmd_presence_handler,
                                    NULL, get_choice_value);
 }
 
-static pj_status_t add_account_command(pj_cli_t *cli)
+static pj_status_t add_account_command(pj_cli_t *c)
 {
     char* account_command =
@@ -2835 +2835 @@
 
     pj_str_t xml = pj_str(account_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL,
+    return pj_cli_add_cmd_from_xml(c, NULL,
                                    &xml, cmd_account_handler,
                                    NULL, get_choice_value);
 }
 
-static pj_status_t add_media_command(pj_cli_t *cli)
+static pj_status_t add_media_command(pj_cli_t *c)
 {
     char* media_command =
@@ -2870 +2870 @@
 
     pj_str_t xml = pj_str(media_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL,
+    return pj_cli_add_cmd_from_xml(c, NULL,
                                    &xml, cmd_media_handler,
                                    NULL, get_choice_value);
 }
 
-static pj_status_t add_config_command(pj_cli_t *cli)
+static pj_status_t add_config_command(pj_cli_t *c)
 {
     char* config_command =
@@ -2891 +2891 @@
 
     pj_str_t xml = pj_str(config_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL,
+    return pj_cli_add_cmd_from_xml(c, NULL,
                                    &xml, cmd_config_handler,
                                    NULL, get_choice_value);
@@ -3042 +3042 @@
 #endif
 
-static pj_status_t add_other_command(pj_cli_t *cli)
+static pj_status_t add_other_command(pj_cli_t *c)
 {
     char* sleep_command =
@@ -3069 +3069 @@
     pj_str_t restart_xml = pj_str(restart_command);
 
-    status = pj_cli_add_cmd_from_xml(cli, NULL,
+    status = pj_cli_add_cmd_from_xml(c, NULL,
                                      &sleep_xml, cmd_sleep_handler,
                                      NULL, NULL);
@@ -3075 +3075 @@
         return status;
 
-    status = pj_cli_add_cmd_from_xml(cli, NULL,
+    status = pj_cli_add_cmd_from_xml(c, NULL,
                                      &network_xml, cmd_network_handler,
                                      NULL, NULL);
@@ -3081 +3081 @@
         return status;
 
-    status = pj_cli_add_cmd_from_xml(cli, NULL,
+    status = pj_cli_add_cmd_from_xml(c, NULL,
                                      &shutdown_xml, cmd_quit_handler,
                                      NULL, NULL);
@@ -3088 +3088 @@
         return status;
 
-    status = pj_cli_add_cmd_from_xml(cli, NULL,
+    status = pj_cli_add_cmd_from_xml(c, NULL,
                                      &restart_xml, cmd_restart_handler,
                                      NULL, NULL);
@@ -3095 +3095 @@
 }
 
-pj_status_t cli_setup_command(pj_cli_t *cli)
+pj_status_t cli_setup_command(pj_cli_t *c)
 {
     pj_status_t status;
 
-    status = add_call_command(cli);
+    status = add_call_command(c);
     if (status != PJ_SUCCESS)
         return status;
 
-    status = add_presence_command(cli);
+    status = add_presence_command(c);
     if (status != PJ_SUCCESS)
         return status;
 
-    status = add_account_command(cli);
+    status = add_account_command(c);
     if (status != PJ_SUCCESS)
         return status;
 
-    status = add_media_command(cli);
+    status = add_media_command(c);
     if (status != PJ_SUCCESS)
         return status;
 
-    status = add_config_command(cli);
+    status = add_config_command(c);
     if (status != PJ_SUCCESS)
         return status;
 
 #if PJSUA_HAS_VIDEO
-    status = add_video_command(cli);
+    status = add_video_command(c);
     if (status != PJ_SUCCESS)
         return status;
 #endif
 
-    status = add_other_command(cli);
+    status = add_other_command(c);
 
     return status;

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c

@@ -607 +607 @@
 {
     char buf[128];
-    pjsua_msg_data msg_data;
+    pjsua_msg_data msg_data_;
     input_result result;
     pj_str_t tmp;
@@ -632 +632 @@
     }
 
-    pjsua_msg_data_init(&msg_data);
-    TEST_MULTIPART(&msg_data);
+    pjsua_msg_data_init(&msg_data_);
+    TEST_MULTIPART(&msg_data_);
     pjsua_call_make_call(current_acc, &tmp, &call_opt, NULL,
-                         &msg_data, &current_call);
+                         &msg_data_, &current_call);
 }
 
@@ -758 +758 @@
     pjsua_call_info call_info;
     char buf[128];
-    pjsua_msg_data msg_data;
+    pjsua_msg_data msg_data_;
 
     if (current_call != -1) {
@@ -790 +790 @@
             return;
 
-        pjsua_msg_data_init(&msg_data);
+        pjsua_msg_data_init(&msg_data_);
 
         if (st_code/100 == 3) {
@@ -799 +799 @@
             pjsip_generic_string_hdr_init2(&hcontact, &hname, &hvalue);
 
-            pj_list_push_back(&msg_data.hdr_list, &hcontact);
+            pj_list_push_back(&msg_data_.hdr_list, &hcontact);
         }
 
@@ -813 +813 @@
         }
 
-        pjsua_call_answer2(current_call, &call_opt, st_code, NULL, &msg_data);
+        pjsua_call_answer2(current_call, &call_opt, st_code, NULL, &msg_data_);
     }
 }
@@ -1080 +1080 @@
         pjsua_call_info ci;
         input_result result;
-        pjsua_msg_data msg_data;
+        pjsua_msg_data msg_data_;
 
         pjsua_call_get_info(current_call, &ci);
@@ -1095 +1095 @@
         }
 
-        pjsua_msg_data_init(&msg_data);
+        pjsua_msg_data_init(&msg_data_);
         if (no_refersub) {
             /* Add Refer-Sub: false in outgoing REFER request */
             pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB,
                 &STR_FALSE);
-            pj_list_push_back(&msg_data.hdr_list, &refer_sub);
+            pj_list_push_back(&msg_data_.hdr_list, &refer_sub);
         }
         if (result.nb_result != PJSUA_APP_NO_NB) {
@@ -1108 +1108 @@
                 pjsua_buddy_info binfo;
                 pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                pjsua_call_xfer( current_call, &binfo.uri, &msg_data);
+                pjsua_call_xfer( current_call, &binfo.uri, &msg_data_);
             }
 
@@ -1114 +1114 @@
             pj_str_t tmp;
             tmp = pj_str(result.uri_result);
-            pjsua_call_xfer( current_call, &tmp, &msg_data);
+            pjsua_call_xfer( current_call, &tmp, &msg_data_);
         }
     }
@@ -1131 +1131 @@
         pjsua_call_id ids[PJSUA_MAX_CALLS];
         pjsua_call_info ci;
-        pjsua_msg_data msg_data;
+        pjsua_msg_data msg_data_;
         char buf[128];
         unsigned i, count;
@@ -1190 +1190 @@
         }
 
-        pjsua_msg_data_init(&msg_data);
+        pjsua_msg_data_init(&msg_data_);
         if (no_refersub) {
             /* Add Refer-Sub: false in outgoing REFER request */
             pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB,
                                            &STR_FALSE);
-            pj_list_push_back(&msg_data.hdr_list, &refer_sub);
+            pj_list_push_back(&msg_data_.hdr_list, &refer_sub);
         }
 
         pjsua_call_xfer_replaces(call, dst_call,
                                  PJSUA_XFER_NO_REQUIRE_REPLACES,
-                                 &msg_data);
+                                 &msg_data_);
     }
 }
@@ -1263 +1263 @@
         for (i=0; i<digits.slen; ++i) {
             char body[80];
-            pjsua_msg_data msg_data;
+            pjsua_msg_data msg_data_;
 
             pjsua_msg_data_init(&msg_data);
-            msg_data.content_type = pj_str("application/dtmf-relay");
+            msg_data_.content_type = pj_str("application/dtmf-relay");
 
             pj_ansi_snprintf(body, sizeof(body),
@@ -1272 +1272 @@
                 "Duration=160",
                 buf[i]);
-            msg_data.msg_body = pj_str(body);
+            msg_data_.msg_body = pj_str(body);
 
             status = pjsua_call_send_request(current_call, &SIP_INFO,
-                &msg_data);
+                                             &msg_data_);
             if (status != PJ_SUCCESS) {
                 return;

pjproject/trunk/pjsip-apps/src/samples/clidemo.c

@@ -220 +220 @@
  * Simple implementation of app_main() for console targets
  */
-pj_status_t app_main(pj_cli_t *cli)
+pj_status_t app_main(pj_cli_t *c)
 {
     pj_status_t status;
@@ -232 +232 @@
      * Create the console front end
      */
-    status = pj_cli_console_create(cli, &console_cfg, &sess, NULL);
+    status = pj_cli_console_create(c, &console_cfg, &sess, NULL);
     if (status != PJ_SUCCESS)
         return status;
@@ -243 +243 @@
     for (;;) {
         char cmdline[PJ_CLI_MAX_CMDBUF];
-        pj_status_t status;
 
         status = pj_cli_console_process(sess, &cmdline[0], sizeof(cmdline));

pjproject/trunk/pjsip-apps/src/samples/httpdemo.c

@@ -44 +44 @@
 #define THIS_FILE           "http_demo"
 
-static void on_response(pj_http_req *http_req, const pj_http_resp *resp)
+static void on_response(pj_http_req *req, const pj_http_resp *resp)
 {
     unsigned i;
 
-    PJ_UNUSED_ARG(http_req);
+    PJ_UNUSED_ARG(req);
     PJ_LOG(3,(THIS_FILE, "%.*s %d %.*s", (int)resp->version.slen, resp->version.ptr,
                                            resp->status_code,
@@ -66 +66 @@
 }
 
-static void on_send_data(pj_http_req *http_req, void **data, pj_size_t *size)
+static void on_send_data(pj_http_req *req, void **data, pj_size_t *size)
 {
-        PJ_UNUSED_ARG(http_req);
+        PJ_UNUSED_ARG(req);
         PJ_UNUSED_ARG(size);
         PJ_UNUSED_ARG(data);

pjproject/trunk/pjsip-apps/src/samples/mix.c

@@ -196 +196 @@
     while (processed < longest + clock_rate * APPEND * 2 / 1000) {
         pj_int16_t framebuf[PTIME * 48000 / 1000];
-        pjmedia_port *cp = pjmedia_conf_get_master_port(conf);
+        pjmedia_port *mp = pjmedia_conf_get_master_port(conf);
         pjmedia_frame frame;
 
         frame.buf = framebuf;
-        frame.size = PJMEDIA_PIA_SPF(&cp->info) * 2;
+        frame.size = PJMEDIA_PIA_SPF(&mp->info) * 2;
         pj_assert(frame.size <= sizeof(framebuf));
         
-        CHECK( pjmedia_port_get_frame(cp, &frame) );
+        CHECK( pjmedia_port_get_frame(mp, &frame) );
 
         if (frame.type != PJMEDIA_FRAME_TYPE_AUDIO) {

pjproject/trunk/pjsip-apps/src/samples/pcaputil.c

@@ -372 +372 @@
         samples_cnt = 0;
         for (i=0; i<frame_cnt; ++i) {
-            pjmedia_frame pcm_frame;
-
             pcm_frame.buf = pcm;
             pcm_frame.size = samples_per_frame * 2;

pjproject/trunk/pjsip-apps/src/samples/pjsip-perf.c

@@ -968 +968 @@
     if (status != PJ_SUCCESS) {
         pjsip_tx_data *tdata;
-        pj_status_t status;
-
-        status = pjsip_inv_end_session(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE, 
+        pj_status_t status2;
+
+        status2 = pjsip_inv_end_session(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE,
                                        NULL, &tdata);
-        if (status == PJ_SUCCESS && tdata)
-            status = pjsip_inv_send_msg(inv, tdata);
+        if (status2 == PJ_SUCCESS && tdata)
+            status2 = pjsip_inv_send_msg(inv, tdata);
     }
 }

pjproject/trunk/pjsip-apps/src/samples/siprtp.c

@@ -1060 +1060 @@
     {
         pjmedia_sdp_rtpmap rtpmap;
-        pjmedia_sdp_attr *attr;
         char ptstr[10];
 
@@ -2126 +2125 @@
     /* If URL is specified, then make call immediately */
     if (app.uri_to_call.slen) {
-        unsigned i;
-
         PJ_LOG(3,(THIS_FILE, "Making %d calls to %s..", app.max_calls,
                   app.uri_to_call.ptr));

pjproject/trunk/pjsip-apps/src/samples/stateful_proxy.c

@@ -248 +248 @@
         /* This is CANCEL request */
         pjsip_transaction *invite_uas;
-        struct uas_data *uas_data;
+        struct uas_data *uas_data2;
         pj_str_t key;
         
@@ -270 +270 @@
          * we receive final response from the UAC INVITE transaction.
          */
-        uas_data = (struct uas_data*) invite_uas->mod_data[mod_tu.id];
-        if (uas_data->uac_tsx && uas_data->uac_tsx->status_code < 200) {
+        uas_data2 = (struct uas_data*) invite_uas->mod_data[mod_tu.id];
+        if (uas_data2->uac_tsx && uas_data2->uac_tsx->status_code < 200) {
             pjsip_tx_data *cancel;
 
-            pj_grp_lock_acquire(uas_data->uac_tsx->grp_lock);
-
-            pjsip_endpt_create_cancel(global.endpt, uas_data->uac_tsx->last_tx,
+            pj_grp_lock_acquire(uas_data2->uac_tsx->grp_lock);
+
+            pjsip_endpt_create_cancel(global.endpt, uas_data2->uac_tsx->last_tx,
                                       &cancel);
             pjsip_endpt_send_request(global.endpt, cancel, -1, NULL, NULL);
 
-            pj_grp_lock_release(uas_data->uac_tsx->grp_lock);
+            pj_grp_lock_release(uas_data2->uac_tsx->grp_lock);
         }
 

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -435 +435 @@
     /* Add user headers */
     if (!pj_list_empty(&pubc->usr_hdr)) {
-        const pjsip_hdr *hdr;
-
-        hdr = pubc->usr_hdr.next;
-        while (hdr != &pubc->usr_hdr) {
+        const pjsip_hdr *uhdr;
+
+        uhdr = pubc->usr_hdr.next;
+        while (uhdr != &pubc->usr_hdr) {
             pjsip_hdr *new_hdr = (pjsip_hdr*)
-                                 pjsip_hdr_shallow_clone(tdata->pool, hdr);
+                                 pjsip_hdr_shallow_clone(tdata->pool, uhdr);
             pjsip_msg_add_hdr(tdata->msg, new_hdr);
-            hdr = hdr->next;
+            uhdr = uhdr->next;
         }
     }

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -243 +243 @@
                                  pjsip_uri_get_uri(dlg->remote.info->uri);
         if (!pj_list_empty(&sip_uri->header_param)) {
-            pj_str_t tmp;
+            pj_str_t tmp2;
 
             /* Remove all header param */
@@ -249 +249 @@
 
             /* Print URI */
-            tmp.ptr = (char*) pj_pool_alloc(dlg->pool,
+            tmp2.ptr = (char*) pj_pool_alloc(dlg->pool,
                                             dlg->remote.info_str.slen);
-            tmp.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
-                                       sip_uri, tmp.ptr,
+            tmp2.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
+                                       sip_uri, tmp2.ptr,
                                        dlg->remote.info_str.slen);
 
-            if (tmp.slen < 1) {
+            if (tmp2.slen < 1) {
                 status = PJSIP_EURITOOLONG;
                 goto on_error;
@@ -261 +261 @@
 
             /* Assign remote.info_str */
-            dlg->remote.info_str = tmp;
+            dlg->remote.info_str = tmp2;
         }
     }
@@ -392 +392 @@
      */
     if (contact) {
-        pj_str_t tmp;
-
-        pj_strdup_with_null(dlg->pool, &tmp, contact);
+        pj_str_t tmp2;
+
+        pj_strdup_with_null(dlg->pool, &tmp2, contact);
         dlg->local.contact = (pjsip_contact_hdr*)
-                             pjsip_parse_hdr(dlg->pool, &HCONTACT, tmp.ptr,
-                                             tmp.slen, NULL);
+                             pjsip_parse_hdr(dlg->pool, &HCONTACT, tmp2.ptr,
+                                             tmp2.slen, NULL);
         if (!dlg->local.contact) {
             status = PJSIP_EINVALIDURI;

pjproject/trunk/pjsip/src/pjsip/sip_multipart.c

@@ -593 +593 @@
     endptr = buf + len;
     {
-        pj_str_t body;
-
-        body.ptr = buf; body.slen = len;
-        curptr = pj_strstr(&body, &delim);
+        pj_str_t strbody;
+
+        strbody.ptr = buf; strbody.slen = len;
+        curptr = pj_strstr(&strbody, &delim);
         if (!curptr)
             return NULL;

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -675 +675 @@
     char hname_copy[PJSIP_MAX_HNAME_LEN];
     pj_str_t tmp;
-    pjsip_parse_hdr_func *handler;
+    pjsip_parse_hdr_func *func;
 
     if (hname->slen >= PJSIP_MAX_HNAME_LEN) {
@@ -684 +684 @@
     /* First, common case, try to find handler with exact name */
     hash = pj_hash_calc(0, hname->ptr, (unsigned)hname->slen);
-    handler = find_handler_imp(hash, hname);
-    if (handler)
-        return handler;
+    func = find_handler_imp(hash, hname);
+    if (func)
+        return func;
 
 
@@ -981 +981 @@
         /* Parse headers. */
         do {
-            pjsip_parse_hdr_func * handler;
+            pjsip_parse_hdr_func * func;
             pjsip_hdr *hdr = NULL;
 
@@ -996 +996 @@
             
             /* Find handler. */
-            handler = find_handler(&hname);
+            func = find_handler(&hname);
             
             /* Call the handler if found.
@@ -1002 +1002 @@
              * hname/hvalue pair.
              */
-            if (handler) {
-                hdr = (*handler)(ctx);
+            if (func) {
+                hdr = (*func)(ctx);
 
                 /* Note:
@@ -2263 +2263 @@
 
     PJ_TRY {
-        pjsip_parse_hdr_func *handler = find_handler(hname);
-        if (handler) {
-            hdr = (*handler)(&context);
+        pjsip_parse_hdr_func *func = find_handler(hname);
+        if (func) {
+            hdr = (*func)(&context);
         } else {
             hdr = parse_hdr_generic_string(&context);
@@ -2311 +2311 @@
         /* Parse headers. */
         do {
-            pjsip_parse_hdr_func * handler;
+            pjsip_parse_hdr_func * func;
             pjsip_hdr *hdr = NULL;
 
@@ -2326 +2326 @@
 
             /* Find handler. */
-            handler = find_handler(&hname);
+            func = find_handler(&hname);
 
             /* Call the handler if found.
@@ -2332 +2332 @@
              * hname/hvalue pair.
              */
-            if (handler) {
-                hdr = (*handler)(&ctx);
+            if (func) {
+                hdr = (*func)(&ctx);
             } else {
                 hdr = parse_hdr_generic_string(&ctx);

pjproject/trunk/pjsip/src/pjsip/sip_tel_uri.c

@@ -400 +400 @@
     if (parse_params && *scanner->curptr==';') {
         pj_str_t pname, pvalue;
-        const pjsip_parser_const_t *pc = pjsip_parser_const();
 
         do {

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -1184 +1184 @@
             /* Start keep-alive timer */
             if (pjsip_cfg()->tcp.keep_alive_interval) {
-                pj_time_val delay = {pjsip_cfg()->tcp.keep_alive_interval, 0};
+                pj_time_val delay = { 0 };
+                delay.sec = pjsip_cfg()->tcp.keep_alive_interval;
                 pjsip_endpt_schedule_timer(listener->endpt, 
                                            &tcp->ka_timer, 
@@ -1543 +1544 @@
     /* Start keep-alive timer */
     if (pjsip_cfg()->tcp.keep_alive_interval) {
-        pj_time_val delay = { pjsip_cfg()->tcp.keep_alive_interval, 0 };
+        pj_time_val delay = { 0 };
+        delay.sec = pjsip_cfg()->tcp.keep_alive_interval;
         pjsip_endpt_schedule_timer(tcp->base.endpt, &tcp->ka_timer, 
                                    &delay);

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -2537 +2537 @@
 
         if (0 && status == PJ_SUCCESS && pjsua_var.acc[acc_id].cred_cnt) {
-            pjsua_acc *acc = &pjsua_var.acc[acc_id];
             pjsip_authorization_hdr *h;
             char *uri;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -4511 +4511 @@
          * Always answer with 2xx.
          */
-        pjsip_tx_data *tdata;
+        pjsip_tx_data *tdata2;
         const pj_str_t str_false = { "false", 5};
         pjsip_hdr *hdr;
 
         status = pjsip_dlg_create_response(inv->dlg, rdata, code, NULL,
-                                           &tdata);
+                                           &tdata2);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to create 2xx response to REFER",
@@ -4525 +4525 @@
         /* Add Refer-Sub header */
         hdr = (pjsip_hdr*)
-               pjsip_generic_string_hdr_create(tdata->pool, &str_refer_sub,
+               pjsip_generic_string_hdr_create(tdata2->pool, &str_refer_sub,
                                               &str_false);
-        pjsip_msg_add_hdr(tdata->msg, hdr);
+        pjsip_msg_add_hdr(tdata2->msg, hdr);
 
 
         /* Send answer */
         status = pjsip_dlg_send_response(inv->dlg, pjsip_rdata_get_tsx(rdata),
-                                         tdata);
+                                         tdata2);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to create 2xx response to REFER",

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -907 +907 @@
     if (ua_cfg->nameserver_count) {
 #if PJSIP_HAS_RESOLVER
-        unsigned i;
+        unsigned ii;
 
         /* Create DNS resolver */
@@ -934 +934 @@
 
         /* Print nameservers */
-        for (i=0; i<ua_cfg->nameserver_count; ++i) {
+        for (ii=0; ii<ua_cfg->nameserver_count; ++ii) {
             PJ_LOG(4,(THIS_FILE, "Nameserver %.*s added",
-                      (int)ua_cfg->nameserver[i].slen,
-                      ua_cfg->nameserver[i].ptr));
+                      (int)ua_cfg->nameserver[ii].slen,
+                      ua_cfg->nameserver[ii].ptr));
         }
 #else
@@ -1100 +1100 @@
     /* Start worker thread if needed. */
     if (pjsua_var.ua_cfg.thread_cnt) {
-        unsigned i;
+        unsigned ii;
 
         if (pjsua_var.ua_cfg.thread_cnt > PJ_ARRAY_SIZE(pjsua_var.thread))
             pjsua_var.ua_cfg.thread_cnt = PJ_ARRAY_SIZE(pjsua_var.thread);
 
-        for (i=0; i<pjsua_var.ua_cfg.thread_cnt; ++i) {
+        for (ii=0; ii<pjsua_var.ua_cfg.thread_cnt; ++ii) {
             status = pj_thread_create(pjsua_var.pool, "pjsua", &worker_thread,
-                                      NULL, 0, 0, &pjsua_var.thread[i]);
+                                      NULL, 0, 0, &pjsua_var.thread[ii]);
             if (status != PJ_SUCCESS)
                 goto on_error;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_dump.c

@@ -372 +372 @@
         /* Get and ICE SRTP status */
         if (call_med->tp) {
-            pjmedia_transport_info tp_info;
-
-            pjmedia_transport_info_init(&tp_info);
-            pjmedia_transport_get_info(call_med->tp, &tp_info);
             if (tp_info.specific_info_cnt > 0) {
                 unsigned j;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -440 +440 @@
         } else {
             if (acc->cfg.allow_sdp_nat_rewrite && acc->reg_mapped_addr.slen) {
-                pj_status_t status;
+                pj_status_t status2;
 
                 /* Take the address from mapped addr as seen by registrar */
-                status = pj_sockaddr_set_str_addr(af, &bound_addr,
-                                                  &acc->reg_mapped_addr);
-                if (status != PJ_SUCCESS) {
+                status2 = pj_sockaddr_set_str_addr(af, &bound_addr,
+                                                   &acc->reg_mapped_addr);
+                if (status2 != PJ_SUCCESS) {
                     /* just leave bound_addr with whatever it was
                     pj_bzero(pj_sockaddr_get_addr(&bound_addr),

pjproject/trunk/pjsip/src/pjsua2/call.cpp

@@ -153 +153 @@
 
 
-void CallAudioMedia::setPortId(int id)
-{
-    this->id = id;
+void CallAudioMedia::setPortId(int pid)
+{
+    this->id = pid;
 }
 

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -1512 +1512 @@
     dir = param.dir;
     packing = param.packing;
-    ignoreFmtp = param.ignore_fmtp;
+    ignoreFmtp = param.ignore_fmtp != PJ_FALSE;
     encMtu = param.enc_mtu;
     encFmt.fromPj(param.enc_fmt);

pjproject/trunk/pjsip/src/pjsua2/siptypes.cpp

@@ -305 +305 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-void TransportInfo::fromPj(const pjsua_transport_info &info)
-{
-    this->id = info.id;
-    this->type = info.type;
-    this->typeName = pj2Str(info.type_name);
-    this->info = pj2Str(info.info);
-    this->flags = info.flag;
+void TransportInfo::fromPj(const pjsua_transport_info &tinfo)
+{
+    this->id = tinfo.id;
+    this->type = tinfo.type;
+    this->typeName = pj2Str(tinfo.type_name);
+    this->info = pj2Str(tinfo.info);
+    this->flags = tinfo.flag;
 
     char straddr[PJ_INET6_ADDRSTRLEN+10];
-    pj_sockaddr_print(&info.local_addr, straddr, sizeof(straddr), 3);
+    pj_sockaddr_print(&tinfo.local_addr, straddr, sizeof(straddr), 3);
     this->localAddress = straddr;
 
     pj_ansi_snprintf(straddr, sizeof(straddr), "%.*s:%d",
-                     (int)info.local_name.host.slen,
-                     info.local_name.host.ptr,
-                     info.local_name.port);
+                     (int)tinfo.local_name.host.slen,
+                     tinfo.local_name.host.ptr,
+                     tinfo.local_name.port);
     this->localName = straddr;
-    this->usageCount = info.usage_count;
+    this->usageCount = tinfo.usage_count;
 }
 

pjproject/trunk/pjsip/src/test/dns_test.c

@@ -174 +174 @@
      */
     for (i=0; i<PJ_ARRAY_SIZE(ans); ++i) {
-        pj_dns_parsed_query q;
+        pj_dns_parsed_query q2;
         char buf[128];
         char *services[] = { "_sip._udp.", "_sip._tcp.", "_sips._tcp."};
@@ -180 +180 @@
 
         for (j=0; j<PJ_ARRAY_SIZE(services); ++j) {
-            q.dnsclass = PJ_DNS_CLASS_IN;
-            q.type = PJ_DNS_TYPE_SRV;
-
-            q.name.ptr = buf;
+            q2.dnsclass = PJ_DNS_CLASS_IN;
+            q2.type = PJ_DNS_TYPE_SRV;
+
+            q2.name.ptr = buf;
             pj_bzero(buf, sizeof(buf));
-            pj_strcpy2(&q.name, services[j]);
-            pj_strcat(&q.name, &ans[i].rdata.srv.target);
+            pj_strcpy2(&q2.name, services[j]);
+            pj_strcat(&q2.name, &ans[i].rdata.srv.target);
 
             pj_bzero(&pkt, sizeof(pkt));
@@ -192 +192 @@
             pkt.hdr.flags = PJ_DNS_SET_QR(1) |
                             PJ_DNS_SET_RCODE(PJ_DNS_RCODE_NXDOMAIN);
-            pkt.q = &q;
+            pkt.q = &q2;
             
             pj_dns_resolver_add_entry( resv, &pkt, PJ_FALSE);
@@ -407 +407 @@
 
         while (result.status == 0x12345678) {
-            int i = 0;
+            int ii = 0;
             pj_time_val timeout = { 1, 0 };
             pjsip_endpt_handle_events(endpt, &timeout);
-            if (i == 1)
+            if (ii == 1)
                 pj_dns_resolver_dump(pjsip_endpt_get_resolver(endpt), PJ_TRUE);
         }

pjproject/trunk/pjsip/src/test/tsx_uas_test.c

@@ -262 +262 @@
 /* Schedule timer to send response for the specified UAS transaction */
 static void schedule_send_response( pjsip_rx_data *rdata,
-                                    const pj_str_t *tsx_key,
+                                    const pj_str_t *tsx_key_,
                                     int status_code,
                                     int msec_delay )
@@ -281 +281 @@
 
     r = PJ_POOL_ALLOC_T(tdata->pool, struct response);
-    pj_strdup(tdata->pool, &r->tsx_key, tsx_key);
+    pj_strdup(tdata->pool, &r->tsx_key, tsx_key_);
     r->tdata = tdata;
 

pjproject/trunk/third_party/build/speex/config.h

@@ -27 +27 @@
 #   pragma warning(disable: 4305)   // truncation from 'const double ' to 'float '
 #   pragma warning(disable: 4018)   // signed/unsigned mismatch
+#   pragma warning(disable: 4456)   // declaration of '[var]' hides previous local declaration
 //#   pragma warning(disable: 4701)   // local variable used without initialized
 #endif