Changeset 5980 for pjproject/trunk/pjlib/src/pj/ioqueue_select.c

Timestamp:

May 9, 2019 4:35:41 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJLIB to use PJ_ERROR consistently.

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_select.c (modified) (9 diffs)

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

@@ -751 +751 @@
             status = pj_sock_getsockname(old_sock, &local_addr, &addr_len);
             if (status != PJ_SUCCESS) {
-                PJ_LOG(5,(THIS_FILE, "Error get socket name %d", status));
+                PJ_PERROR(5,(THIS_FILE, status, "Error get socket name"));
                 continue;
             }
@@ -758 +758 @@
             status = pj_sock_getpeername(old_sock, &rem_addr, &addr_len);
             if (status != PJ_SUCCESS) {
-                PJ_LOG(5,(THIS_FILE, "Error get peer name %d", status));
+                PJ_PERROR(5,(THIS_FILE, status, "Error get peer name"));
             } else {
                 flags |= HAS_PEER_ADDR;
@@ -767 +767 @@
                 status == PJ_STATUS_FROM_OS(EINVAL))
             {
-                PJ_LOG(5,(THIS_FILE, "Error get qos param %d", status));
+                PJ_PERROR(5,(THIS_FILE, status, "Error get qos param"));
                 continue;
             }
         
             if (status != PJ_SUCCESS) {
-                PJ_LOG(5,(THIS_FILE, "Error get qos param %d", status));
+                PJ_PERROR(5,(THIS_FILE, status, "Error get qos param"));
             } else {
                 flags |= HAS_QOS;
@@ -782 +782 @@
             status = pj_sock_close(old_sock);
             if (status != PJ_SUCCESS) {
-                PJ_LOG(5,(THIS_FILE, "Error closing socket %d", status));
+                PJ_PERROR(5,(THIS_FILE, status, "Error closing socket"));
             }
             
@@ -792 +792 @@
                                 &new_sock);
         if (status != PJ_SUCCESS) {
-            PJ_LOG(5,(THIS_FILE, "Error create socket %d", status));
+            PJ_PERROR(5,(THIS_FILE, status, "Error create socket"));
             continue;
         }
@@ -805 +805 @@
             status == PJ_STATUS_FROM_OS(EINVAL))
         {
-            PJ_LOG(5,(THIS_FILE, "Error set socket option %d",
-                      status));
+            PJ_PERROR(5,(THIS_FILE, status, "Error set socket option"));
             continue;
         }
@@ -826 +825 @@
             status = pj_sock_set_qos_params(new_sock, &qos_params);
             if (status == PJ_STATUS_FROM_OS(EINVAL)) {
-                PJ_LOG(5,(THIS_FILE, "Error set qos param %d", status));
+                PJ_PERROR(5,(THIS_FILE, status, "Error set qos param"));
                 continue;
             }
@@ -834 +833 @@
             status = pj_sock_connect(new_sock, &rem_addr, addr_len);
             if (status != PJ_SUCCESS) {
-                PJ_LOG(5,(THIS_FILE, "Error connect socket %d", status));
+                PJ_PERROR(5,(THIS_FILE, status, "Error connect socket"));
                 continue;
             }
@@ -889 +888 @@
 
     h->fd = PJ_INVALID_SOCKET;
-    PJ_PERROR(1,(THIS_FILE, status, "Error replacing socket [%d]", status));
+    PJ_PERROR(1,(THIS_FILE, status, "Error replacing socket %d", old_sock));
     pj_lock_release(h->ioqueue->lock);
     return PJ_ESOCKETSTOP;