Changeset 3666 for pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

Timestamp:

Jul 19, 2011 8:40:20 AM (13 years ago)

Author:

nanang

Message:

Re #1326:

• Fixed compile warnings on vs2005
• Fixed compile error when PJMEDIA_HAS_VIDEO set to 0 on vs2005

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c (modified) (3 diffs)

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

@@ -284 +284 @@
         struct write_operation *write_op;
         pj_ssize_t sent;
-        pj_status_t send_rc;
+        pj_status_t send_rc = PJ_SUCCESS;
 
         /* Get the first in the queue. */
@@ -313 +313 @@
             //write_op->op = 0;
         } else if (write_op->op == PJ_IOQUEUE_OP_SEND_TO) {
-            int retry;
-            for (retry=0; retry<2; ++retry) {
+            int retry = 2;
+            while (--retry >= 0) {
                 send_rc = pj_sock_sendto(h->fd, 
                                          write_op->buf+write_op->written,
@@ -936 +936 @@
     struct write_operation *write_op;
     unsigned retry;
+    pj_bool_t restart_retry = PJ_FALSE;
+    pj_status_t status;
+    pj_ssize_t sent;
+
+    PJ_ASSERT_RETURN(key && op_key && data && length, PJ_EINVAL);
+    PJ_CHECK_STACK();
+
 #if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
             PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
-    pj_bool_t restart_retry = PJ_FALSE;
+retry_on_restart:
+#else
+    PJ_UNUSED_ARG(restart_retry);
 #endif
-    pj_status_t status;
-    pj_ssize_t sent;
-
-    PJ_ASSERT_RETURN(key && op_key && data && length, PJ_EINVAL);
-    PJ_CHECK_STACK();
-
-retry_on_restart:
     /* Check if key is closing. */
     if (IS_CLOSING(key))