From 7d672984f4dc6a87cb0c7d99279c6175fcdc3ad0 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 29 Mar 2017 23:23:56 +0200 Subject: [PATCH 1/1] apps/*.c: switch to platform-neutral format modifiers in BIO_print calls. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3083) --- apps/enc.c | 4 ++-- apps/s_cb.c | 4 ++-- apps/s_client.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/enc.c b/apps/enc.c index 30c3c6329e..a1b2b3cac8 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -548,8 +548,8 @@ int enc_main(int argc, char **argv) ret = 0; if (verbose) { - BIO_printf(bio_err, "bytes read :%8"PRIu64"\n", BIO_number_read(in)); - BIO_printf(bio_err, "bytes written:%8"PRIu64"\n", BIO_number_written(out)); + BIO_printf(bio_err, "bytes read :%8ju\n", BIO_number_read(in)); + BIO_printf(bio_err, "bytes written:%8ju\n", BIO_number_written(out)); } end: ERR_print_errors(bio_err); diff --git a/apps/s_cb.c b/apps/s_cb.c index 4400580119..f395a2a278 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -1042,8 +1042,8 @@ static char *hexencode(const unsigned char *data, size_t len) int ilen = (int) outlen; if (outlen < len || ilen < 0 || outlen != (size_t)ilen) { - BIO_printf(bio_err, "%s: %" PRIu64 "-byte buffer too large to hexencode\n", - opt_getprog(), (uint64_t)len); + BIO_printf(bio_err, "%s: %zu-byte buffer too large to hexencode\n", + opt_getprog(), len); exit(1); } cp = out = app_malloc(ilen, "TLSA hex data buffer"); diff --git a/apps/s_client.c b/apps/s_client.c index fc18da282c..cab7e251de 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2901,8 +2901,8 @@ static void print_stuff(BIO *bio, SSL *s, int full) #endif BIO_printf(bio, - "---\nSSL handshake has read %" PRIu64 - " bytes and written %" PRIu64 " bytes\n", + "---\nSSL handshake has read %ju bytes " + "and written %ju bytes\n", BIO_number_read(SSL_get_rbio(s)), BIO_number_written(SSL_get_wbio(s))); } -- 2.34.1