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

Timestamp:

May 11, 2007 3:14:34 PM (17 years ago)

Author:

bennylp

Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:

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

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

@@ -302 +302 @@
         } else {
             pj_assert(!"Invalid operation type!");
-            write_op->op = 0;
+            write_op->op = PJ_IOQUEUE_OP_NONE;
             send_rc = PJ_EBUG;
         }
@@ -319 +319 @@
         {
 
-            write_op->op = 0;
+            write_op->op = PJ_IOQUEUE_OP_NONE;
 
             if (h->fd_type != PJ_SOCK_DGRAM) {
@@ -376 +376 @@
         accept_op = h->accept_list.next;
         pj_list_erase(accept_op);
-        accept_op->op = 0;
+        accept_op->op = PJ_IOQUEUE_OP_NONE;
 
         /* Clear bit in fdset if there is no more pending accept */
@@ -418 +418 @@
 
         if ((read_op->op == PJ_IOQUEUE_OP_RECV_FROM)) {
-            read_op->op = 0;
+            read_op->op = PJ_IOQUEUE_OP_NONE;
             rc = pj_sock_recvfrom(h->fd, read_op->buf, &bytes_read, 
                                   read_op->flags,
@@ -424 +424 @@
                                   read_op->rmt_addrlen);
         } else if ((read_op->op == PJ_IOQUEUE_OP_RECV)) {
-            read_op->op = 0;
+            read_op->op = PJ_IOQUEUE_OP_NONE;
             rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, 
                               read_op->flags);
         } else {
             pj_assert(read_op->op == PJ_IOQUEUE_OP_READ);
-            read_op->op = 0;
+            read_op->op = PJ_IOQUEUE_OP_NONE;
             /*
              * User has specified pj_ioqueue_read().
@@ -562 +562 @@
 
     read_op = (struct read_operation*)op_key;
-    read_op->op = 0;
+    read_op->op = PJ_IOQUEUE_OP_NONE;
 
     /* Check if key is closing. */
@@ -631 +631 @@
 
     read_op = (struct read_operation*)op_key;
-    read_op->op = 0;
+    read_op->op = PJ_IOQUEUE_OP_NONE;
 
     /* Try to see if there's data immediately available. 
@@ -769 +769 @@
 
     write_op->op = PJ_IOQUEUE_OP_SEND;
-    write_op->buf = (void*)data;
+    write_op->buf = (char*)data;
     write_op->size = *length;
     write_op->written = 0;
@@ -849 +849 @@
      * Check that address storage can hold the address parameter.
      */
-    PJ_ASSERT_RETURN(addrlen <= sizeof(pj_sockaddr_in), PJ_EBUG);
+    PJ_ASSERT_RETURN(addrlen <= (int)sizeof(pj_sockaddr_in), PJ_EBUG);
 
     /*
@@ -884 +884 @@
 
     write_op->op = PJ_IOQUEUE_OP_SEND_TO;
-    write_op->buf = (void*)data;
+    write_op->buf = (char*)data;
     write_op->size = *length;
     write_op->written = 0;
@@ -921 +921 @@
 
     accept_op = (struct accept_operation*)op_key;
-    accept_op->op = 0;
+    accept_op->op = PJ_IOQUEUE_OP_NONE;
 
     /* Fast track:
@@ -1053 +1053 @@
         if (op_rec == (void*)op_key) {
             pj_list_erase(op_rec);
-            op_rec->op = 0;
+            op_rec->op = PJ_IOQUEUE_OP_NONE;
             pj_mutex_unlock(key->mutex);
 
@@ -1067 +1067 @@
         if (op_rec == (void*)op_key) {
             pj_list_erase(op_rec);
-            op_rec->op = 0;
+            op_rec->op = PJ_IOQUEUE_OP_NONE;
             pj_mutex_unlock(key->mutex);
 
@@ -1081 +1081 @@
         if (op_rec == (void*)op_key) {
             pj_list_erase(op_rec);
-            op_rec->op = 0;
+            op_rec->op = PJ_IOQUEUE_OP_NONE;
             pj_mutex_unlock(key->mutex);