Changeset 5984 for pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

Timestamp:

May 9, 2019 8:18:18 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJSIP* to use PJ_ERROR consistently.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_resolve.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -513 +513 @@
 on_error:
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-        PJ_LOG(4,(THIS_FILE, "Failed to resolve '%.*s'. Err=%d (%s)",
-                             (int)target->addr.host.slen,
-                             target->addr.host.ptr,
-                             status,
-                             pj_strerror(status,errmsg,sizeof(errmsg)).ptr));
+        PJ_PERROR(4,(THIS_FILE, status,
+                     "Failed to resolve '%.*s'",
+                     (int)target->addr.host.slen,
+                     target->addr.host.ptr));
         (*cb)(status, token, NULL);
         return;
@@ -568 +566 @@
     
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        /* Log error */
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(query->objname, "DNS A record resolution failed: %s", 
-                  errmsg));
+        PJ_PERROR(4,(query->objname, status,
+                     "DNS A record resolution failed"));
 
         query->last_error = status;
@@ -631 +625 @@
     
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        /* Log error */
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(query->objname, "DNS AAAA record resolution failed: %s", 
-                  errmsg));
+        PJ_PERROR(4,(query->objname, status,
+                     "DNS AAAA record resolution failed"));
 
         query->last_error = status;
@@ -661 +651 @@
 
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        /* Log error */
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(query->objname, "DNS A/AAAA record resolution failed: %s",
-                  errmsg));
+        PJ_PERROR(4,(query->objname, status,
+                     "DNS A/AAAA record resolution failed"));
 
         /* Call the callback */