Changeset 5981 for pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

Timestamp:

May 9, 2019 4:54:38 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJLIB-UTIL to use PJ_ERROR consistently.

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c (modified) (4 diffs)

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

@@ -1594 +1594 @@
         } else {
             /* Error occurs */
-            char errmsg[PJ_ERR_MSG_SIZE];
-
-            pj_strerror(status, errmsg, sizeof(errmsg));
-            PJ_LOG(4,(resolver->name.ptr,
-                      "Error transmitting request: %s", errmsg));
+            PJ_PERROR(4,(resolver->name.ptr, status,
+                         "Error transmitting request"));
 
             /* Let it fallback to timeout section below */
@@ -1686 +1683 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
         status = (pj_status_t)-bytes_read;
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(resolver->name.ptr, "DNS resolver read error: %s", errmsg));
+        PJ_PERROR(4,(resolver->name.ptr, status, "DNS resolver read error"));
 
         goto read_next_packet;
@@ -1727 +1721 @@
     /* Handle parse error */
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(3,(resolver->name.ptr, 
-                  "Error parsing DNS response from %s:%d: %s", 
-                  pj_sockaddr_print(src_addr, addr, sizeof(addr), 2),
-                  pj_sockaddr_get_port(src_addr),
-                  errmsg));
+        PJ_PERROR(3,(resolver->name.ptr, status,
+                     "Error parsing DNS response from %s:%d", 
+                     pj_sockaddr_print(src_addr, addr, sizeof(addr), 2),
+                     pj_sockaddr_get_port(src_addr)));
         goto read_next_packet;
     }
@@ -1815 +1805 @@
 
     if (status != PJ_EPENDING && status != PJ_ECANCELLED) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        pj_strerror(status, errmsg, sizeof(errmsg));    
-        PJ_LOG(4,(resolver->name.ptr, "DNS resolver ioqueue read error: %s",
-                  errmsg));
+        PJ_PERROR(4,(resolver->name.ptr, status,
+                     "DNS resolver ioqueue read error"));
 
         pj_assert(!"Unhandled error");