Changeset 5170 for pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c

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.

File:

• pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c (modified) (5 diffs)

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);
 }