Changeset 2993 for pjproject/trunk

Timestamp:

Nov 9, 2009 4:32:33 AM (15 years ago)

Author:

bennylp

Message:

More #950 (QoS): updated with the new pj_perror() syntax

Location:

pjproject/trunk

Files:

• pjlib/src/pj/sock_qos_common.c (modified) (3 diffs)
• pjnath/src/pjnath/stun_sock.c (modified) (2 diffs)

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

@@ -99 +99 @@
                                        const char *sock_name)
 {
-    char fmt[60];
     pj_status_t qos_type_rc = PJ_SUCCESS,
                 qos_params_rc = PJ_SUCCESS;
@@ -112 +111 @@
 
         if (qos_type_rc != PJ_SUCCESS) {
-            pj_ansi_snprintf(fmt, sizeof(fmt),
-                             "Error setting QoS type %d to %s",
-                             qos_type, sock_name);
-            pj_perror(log_level, log_sender,  qos_type_rc, fmt, 0);
+            pj_perror(log_level, log_sender,  qos_type_rc, 
+                      "Error setting QoS type %d to %s", 
+                      qos_type, sock_name);
         }
     }
@@ -122 +120 @@
         qos_params_rc = pj_sock_set_qos_params(sock, qos_params);
         if (qos_params_rc != PJ_SUCCESS) {
-            pj_ansi_snprintf(fmt, sizeof(fmt),
-                             "Error setting QoS params (flags=%d) to %s",
-                             qos_params->flags, sock_name);
-            pj_perror(log_level, log_sender,  qos_params_rc, fmt, 0);
+            pj_perror(log_level, log_sender,  qos_params_rc, 
+                      "Error setting QoS params (flags=%d) to %s", 
+                      qos_params->flags, sock_name);
             if (qos_type_rc != PJ_SUCCESS)
                 return qos_params_rc;

pjproject/trunk/pjnath/src/pjnath/stun_sock.c

@@ -440 +440 @@
                            pj_status_t status)
 {
-    char errmsg[PJ_ERR_MSG_SIZE];
     pj_bool_t ret;
 
-    pj_strerror(status, errmsg, sizeof(errmsg));
-    PJ_LOG(4,(stun_sock->obj_name, "Session failed because %s failed: %s",
-              pj_stun_sock_op_name(op), errmsg));
+    PJ_PERROR(4,(stun_sock->obj_name, status, 
+                 "Session failed because %s failed",
+                 pj_stun_sock_op_name(op)));
 
     ret = (*stun_sock->cb.on_status)(stun_sock, op, status);
@@ -769 +768 @@
     /* Log socket error */
     if (status != PJ_SUCCESS) {
-        pj_perror(2, stun_sock->obj_name, status, "recvfrom() error", 0);
+        PJ_PERROR(2,(stun_sock->obj_name, status, "recvfrom() error"));
         return PJ_TRUE;
     }