You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2019/07/25 06:41:36 UTC
[qpid-proton] branch master updated: PROTON-2079: Fix usage of
formatting placeholders in printfs
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new d30d70a PROTON-2079: Fix usage of formatting placeholders in printfs
d30d70a is described below
commit d30d70a1ae39ff0d1e31fbfc3723484b3becfdf8
Author: Jiri Danek <jd...@redhat.com>
AuthorDate: Thu Jul 18 16:48:04 2019 +0200
PROTON-2079: Fix usage of formatting placeholders in printfs
---
c/src/messenger/messenger.c | 4 ++--
c/src/sasl/sasl.c | 5 +++--
c/src/ssl/openssl.c | 7 ++++---
c/tools/msgr-recv.c | 2 +-
c/tools/msgr-send.c | 4 ++--
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/c/src/messenger/messenger.c b/c/src/messenger/messenger.c
index 367966f..bc7b57f 100644
--- a/c/src/messenger/messenger.c
+++ b/c/src/messenger/messenger.c
@@ -1999,7 +1999,7 @@ int pn_messenger_put(pn_messenger_t *messenger, pn_message_t *msg)
} else if (err) {
pni_restore(messenger, msg);
return pn_error_format(messenger->error, err, "encode error: %s",
- pn_message_error(msg));
+ pn_error_text(pn_message_error(msg)));
} else {
pni_restore(messenger, msg);
pn_buffer_append(buf, encoded, size); // XXX
@@ -2253,7 +2253,7 @@ int pn_messenger_get(pn_messenger_t *messenger, pn_message_t *msg)
pni_entry_free(entry);
if (err) {
return pn_error_format(messenger->error, err, "error decoding message: %s",
- pn_message_error(msg));
+ pn_error_text(pn_message_error(msg)));
} else {
return 0;
}
diff --git a/c/src/sasl/sasl.c b/c/src/sasl/sasl.c
index 454877e..0cffce1 100644
--- a/c/src/sasl/sasl.c
+++ b/c/src/sasl/sasl.c
@@ -25,6 +25,7 @@
#include "core/dispatch_actions.h"
#include "core/engine-internal.h"
#include "core/util.h"
+#include "platform/platform_fmt.h"
#include "protocol.h"
#include "proton/ssl.h"
@@ -613,7 +614,7 @@ static ssize_t pn_input_read_sasl(pn_transport_t* transport, unsigned int layer,
if (pni_sasl_impl_can_encrypt(transport)) {
sasl->max_encrypt_size = pni_sasl_impl_max_encrypt_size(transport);
if (transport->trace & PN_TRACE_DRV)
- pn_transport_logf(transport, "SASL Encryption enabled: buffer=%d", sasl->max_encrypt_size);
+ pn_transport_logf(transport, "SASL Encryption enabled: buffer=%" PN_ZU, sasl->max_encrypt_size);
transport->io_layers[layer] = &sasl_encrypt_layer;
} else {
transport->io_layers[layer] = &pni_passthru_layer;
@@ -692,7 +693,7 @@ static ssize_t pn_output_write_sasl(pn_transport_t* transport, unsigned int laye
if (pni_sasl_impl_can_encrypt(transport)) {
sasl->max_encrypt_size = pni_sasl_impl_max_encrypt_size(transport);
if (transport->trace & PN_TRACE_DRV)
- pn_transport_logf(transport, "SASL Encryption enabled: buffer=%d", sasl->max_encrypt_size);
+ pn_transport_logf(transport, "SASL Encryption enabled: buffer=%" PN_ZU, sasl->max_encrypt_size);
transport->io_layers[layer] = &sasl_encrypt_layer;
} else {
transport->io_layers[layer] = &pni_passthru_layer;
diff --git a/c/src/ssl/openssl.c b/c/src/ssl/openssl.c
index 8e325a6..7ba5531 100644
--- a/c/src/ssl/openssl.c
+++ b/c/src/ssl/openssl.c
@@ -20,6 +20,7 @@
*/
#include "platform/platform.h"
+#include "platform/platform_fmt.h"
#include "core/engine-internal.h"
#include "core/log_private.h"
#include "core/util.h"
@@ -1037,7 +1038,7 @@ static ssize_t process_input_ssl( pn_transport_t *transport, unsigned int layer,
consumed += written;
ssl->read_blocked = false;
work_pending = (available > 0);
- ssl_log( transport, "Wrote %d bytes to BIO Layer, %d left over", written, available );
+ ssl_log( transport, "Wrote %d bytes to BIO Layer, %" PN_ZU " left over", written, available );
}
} else if (shutdown_input) {
// lower layer (caller) has closed. Close the WRITE side of the BIO. This will cause
@@ -1184,7 +1185,7 @@ static ssize_t process_output_ssl( pn_transport_t *transport, unsigned int layer
if (app_bytes > 0) {
ssl->out_count += app_bytes;
work_pending = true;
- ssl_log(transport, "Gathered %d bytes from app to send to peer", app_bytes );
+ ssl_log(transport, "Gathered %" PN_ZI " bytes from app to send to peer", app_bytes);
} else {
if (app_bytes < 0) {
ssl_log(transport, "Application layer closed its output, error=%d (%d bytes pending send)",
@@ -1467,7 +1468,7 @@ int pn_ssl_get_cert_fingerprint(pn_ssl_t *ssl0, char *fingerprint, size_t finger
}
if(fingerprint_length < min_required_length) {
- ssl_log_error("Insufficient fingerprint_length %i. fingerprint_length must be %i or above for %s digest",
+ ssl_log_error("Insufficient fingerprint_length %" PN_ZU ". fingerprint_length must be %" PN_ZU " or above for %s digest",
fingerprint_length, min_required_length, digest_name);
return PN_ERR;
}
diff --git a/c/tools/msgr-recv.c b/c/tools/msgr-recv.c
index 3b2a24e..cbc9b45 100644
--- a/c/tools/msgr-recv.c
+++ b/c/tools/msgr-recv.c
@@ -258,7 +258,7 @@ int main(int argc, char** argv)
}
}
- LOG("Messages received=%llu sent=%llu\n", received, sent);
+ LOG("Messages received=%" PRIu64 " sent=%" PRIu64 "\n", received, sent);
}
// this will flush any pending sends
diff --git a/c/tools/msgr-send.c b/c/tools/msgr-send.c
index d4299cf..95c515b 100644
--- a/c/tools/msgr-send.c
+++ b/c/tools/msgr-send.c
@@ -289,7 +289,7 @@ int main(int argc, char** argv)
check_messenger(messenger);
}
- LOG("Messages received=%llu sent=%llu\n", received, sent);
+ LOG("Messages received=%" PRIu64 " sent=%" PRIu64 "\n", received, sent);
if (get_replies) {
// wait for the last of the replies
@@ -299,7 +299,7 @@ int main(int argc, char** argv)
check( count > 0 || (opts.timeout == 0),
"Error: timed out waiting for reply messages\n");
received += count;
- LOG("Messages received=%llu sent=%llu\n", received, sent);
+ LOG("Messages received=%" PRIu64 " sent=%" PRIu64 "\n", received, sent);
}
} else if (pn_messenger_outgoing(messenger) > 0) {
LOG("Calling pn_messenger_send()\n");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org