Changeset 5981 for pjproject/trunk/pjlib-util/src/pjlib-util/srv_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/srv_resolver.c (modified) (3 diffs)

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

@@ -686 +686 @@
             status = pj_dns_parse_addr_response(pkt, &rec);
             if (status!=PJ_SUCCESS) {
-                char errmsg[PJ_ERR_MSG_SIZE];
-                
-                PJ_LOG(4,(query_job->objname, 
-                          "DNS %s record parse error for '%.*s'."
-                          " Err=%d (%s)",
-                          (is_type_a ? "A" : "AAAA"),
-                          (int)query_job->domain_part.slen,
-                          query_job->domain_part.ptr,
-                          status,
-                          pj_strerror(status,errmsg,sizeof(errmsg)).ptr));
+                PJ_PERROR(4,(query_job->objname, status,
+                             "DNS %s record parse error for '%.*s'.",
+                             (is_type_a ? "A" : "AAAA"),
+                             (int)query_job->domain_part.slen,
+                             query_job->domain_part.ptr));
             }
         }
@@ -756 +751 @@
 
         } else if (status != PJ_SUCCESS) {
-            char errmsg[PJ_ERR_MSG_SIZE];
-
             /* Update last error */
             query_job->last_error = status;
 
             /* Log error */
-            pj_strerror(status, errmsg, sizeof(errmsg));
-            PJ_LOG(4,(query_job->objname,
-                      "DNS %s record resolution failed: %s",
-                      (is_type_a? "A" : "AAAA"),
-                      errmsg));
+            PJ_PERROR(4,(query_job->objname, status,
+                         "DNS %s record resolution failed",
+                         (is_type_a? "A" : "AAAA")));
         }
 
@@ -841 +832 @@
     /* Check for failure */
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-        PJ_UNUSED_ARG(errmsg);
-        PJ_LOG(4,(query_job->objname, 
-                  "DNS %s record resolution error for '%.*s'."
-                  " Err=%d (%s)",
-                  pj_dns_get_type_name(query_job->dns_state),
-                  (int)query_job->domain_part.slen,
-                  query_job->domain_part.ptr,
-                  status,
-                  pj_strerror(status,errmsg,sizeof(errmsg)).ptr));
+        PJ_PERROR(4,(query_job->objname, status,
+                     "DNS %s record resolution error for '%.*s'.",
+                     pj_dns_get_type_name(query_job->dns_state),
+                     (int)query_job->domain_part.slen,
+                     query_job->domain_part.ptr));
 
         /* Cancel any pending query */