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

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2993 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 10 insertions, 14 deletions

diff --git a/pjlib/src/pj/sock_qos_common.c b/pjlib/src/pj/sock_qos_common.c
index 27ccf097..25ef194a 100644
--- a/pjlib/src/pj/sock_qos_common.c
+++ b/pjlib/src/pj/sock_qos_common.c
@@ -98,7 +98,6 @@ PJ_DEF(pj_status_t) pj_sock_apply_qos( pj_sock_t sock,
 				       const char *log_sender,
 				       const char *sock_name)
 {
-    char fmt[60];
     pj_status_t qos_type_rc = PJ_SUCCESS,
 		qos_params_rc = PJ_SUCCESS;
 
@@ -111,20 +110,18 @@ PJ_DEF(pj_status_t) pj_sock_apply_qos( pj_sock_t sock,
 	qos_type_rc = pj_sock_set_qos_type(sock, qos_type);
 
 	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);
 	}
     }
 
     if (qos_params && qos_params->flags) {
 	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;
 	}
diff --git a/pjnath/src/pjnath/stun_sock.c b/pjnath/src/pjnath/stun_sock.c
index 6bdd77e4..32a3dc0a 100644
--- a/pjnath/src/pjnath/stun_sock.c
+++ b/pjnath/src/pjnath/stun_sock.c
@@ -439,12 +439,11 @@ static pj_bool_t sess_fail(pj_stun_sock *stun_sock,
 			   pj_stun_sock_op op,
 			   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);
 
@@ -768,7 +767,7 @@ static pj_bool_t on_data_recvfrom(pj_activesock_t *asock,
 
     /* 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;
     }