[qpid-dispatch] branch master updated: DISPATCH-1899: cleanup bad log message conversions

[kgiusti]

This is an automated email from the ASF dual-hosted git repository.

kgiusti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new f1a8677  DISPATCH-1899: cleanup bad log message conversions
f1a8677 is described below

commit f1a8677ac176f111f0b91c8159e15965d68696e4
Author: Kenneth Giusti <[hidden email]>
AuthorDate: Tue Jan 12 13:15:14 2021 -0500

    DISPATCH-1899: cleanup bad log message conversions
---
 src/adaptors/http1/http1_client.c | 4 ++--
 src/adaptors/http_common.c        | 2 +-
 src/adaptors/tcp_adaptor.c        | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/adaptors/http1/http1_client.c b/src/adaptors/http1/http1_client.c
index 5115ce4..ffae7ec 100644
--- a/src/adaptors/http1/http1_client.c
+++ b/src/adaptors/http1/http1_client.c
@@ -1507,10 +1507,10 @@ uint64_t qdr_http1_client_core_link_deliver(qdr_http1_adaptor_t    *adaptor,
     // aggregation format
     if (hconn->cfg.aggregation != QD_AGGREGATION_NONE) {
         if (!qd_message_receive_complete(msg)) {
-            qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG, "[C%"PRIu64"][L%"PRIu64"] Response incomplete (%i responses received)", hconn->conn_id, link->identity, DEQ_SIZE(hreq->responses));
+            qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG, "[C%"PRIu64"][L%"PRIu64"] Response incomplete (%zu responses received)", hconn->conn_id, link->identity, DEQ_SIZE(hreq->responses));
             return 0;
         }
-        qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG, "[C%"PRIu64"][L%"PRIu64"] Received response (%i responses received), settling", hconn->conn_id, link->identity, DEQ_SIZE(hreq->responses));
+        qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG, "[C%"PRIu64"][L%"PRIu64"] Received response (%zu responses received), settling", hconn->conn_id, link->identity, DEQ_SIZE(hreq->responses));
         rmsg->dispo = PN_ACCEPTED;
         qd_message_set_send_complete(msg);
         qdr_link_flow(qdr_http1_adaptor->core, link, 1, false);
diff --git a/src/adaptors/http_common.c b/src/adaptors/http_common.c
index 13673be..20319ae 100644
--- a/src/adaptors/http_common.c
+++ b/src/adaptors/http_common.c
@@ -623,7 +623,7 @@ static void _add_http_request_info_CT(qdr_core_t *core, qdr_action_t *action, bo
     }
     if (!updated) {
         DEQ_INSERT_TAIL(_get_request_info()->records, update);
-        qd_log(qd_log_source(QD_HTTP_LOG_SOURCE), QD_LOG_DEBUG, "Added http request info %s (%i)", update->key, DEQ_SIZE(_get_request_info()->records));
+        qd_log(qd_log_source(QD_HTTP_LOG_SOURCE), QD_LOG_DEBUG, "Added http request info %s (%zu)", update->key, DEQ_SIZE(_get_request_info()->records));
     }
 }
 
diff --git a/src/adaptors/tcp_adaptor.c b/src/adaptors/tcp_adaptor.c
index 6ea544f..994f1b4 100644
--- a/src/adaptors/tcp_adaptor.c
+++ b/src/adaptors/tcp_adaptor.c
@@ -123,7 +123,7 @@ static void grant_read_buffers(qdr_tcp_connection_t *conn)
     // Give proactor more read buffers for the socket
     if (!pn_raw_connection_is_read_closed(conn->pn_raw_conn)) {
         size_t desired = pn_raw_connection_read_buffers_capacity(conn->pn_raw_conn);
-        qd_log(tcp_adaptor->log_source, QD_LOG_DEBUG, "[C%"PRIu64"] Granted %i read buffers", conn->conn_id, desired);
+        qd_log(tcp_adaptor->log_source, QD_LOG_DEBUG, "[C%"PRIu64"] Granted %zu read buffers", conn->conn_id, desired);
         while (desired) {
             size_t i;
             for (i = 0; i < desired && i < READ_BUFFERS; ++i) {
@@ -175,7 +175,7 @@ static int handle_incoming(qdr_tcp_connection_t *conn)
         }
     }
 
-    qd_log(tcp_adaptor->log_source, QD_LOG_DEBUG, "[C%"PRIu64"] Took %i read buffers", conn->conn_id, DEQ_SIZE(buffers));
+    qd_log(tcp_adaptor->log_source, QD_LOG_DEBUG, "[C%"PRIu64"] Took %zu read buffers", conn->conn_id, DEQ_SIZE(buffers));
     qd_log(tcp_adaptor->log_source, QD_LOG_DEBUG, "[C%"PRIu64"] Freed %i read buffers", conn->conn_id, free_count);
     grant_read_buffers(conn);
 
@@ -583,7 +583,7 @@ static void handle_connection_event(pn_event_t *e, qd_server_t *qd_server, void
                 }
             }
         }
-        qd_log(log, QD_LOG_DEBUG, "[C%"PRIu64"] PN_RAW_CONNECTION_WRITTEN Wrote %i bytes", conn->conn_id, written);
+        qd_log(log, QD_LOG_DEBUG, "[C%"PRIu64"] PN_RAW_CONNECTION_WRITTEN Wrote %zu bytes", conn->conn_id, written);
         conn->last_out_time = tcp_adaptor->core->uptime_ticks;
         conn->bytes_out += written;
         while (qdr_connection_process(conn->qdr_conn)) {}


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]