commit 35f6fe7ac4fbde98d4fd6af968dfe320011bbe1e
author Bernd Edlinger <bernd.edlinger@hotmail.de> Mon Jul 29 12:26:06 2019 +0200
committer Bernd Edlinger <bernd.edlinger@hotmail.de> Tue Jul 30 20:41:30 2019 +0200
tree e15f9e5c7bdc695715e6917821700889f54404d3
parent 62cc845fc955c8d4de7b703f57bfd8e5854f00f4

Fix BIO_printf format warnings

[extended tests]

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9479)

crypto/x509/pcy_tree.c

diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
index 0c5887c..5d4c6bd 100644
--- a/crypto/x509/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c
@@ -49,7 +49,7 @@
         curr++;
 
     BIO_printf(channel, "Level print after %s\n", str);
-    BIO_printf(channel, "Printing Up to Level %ld\n",
+    BIO_printf(channel, "Printing Up to Level %zd\n",
                curr - tree->levels);
     for (plev = tree->levels; plev != curr; plev++) {
         int i;

ssl/record/ssl3_record.c

diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index d32516e..c5614dc 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -1703,7 +1703,7 @@
         return 0;
     }
     OSSL_TRACE_BEGIN(TLS) {
-        BIO_printf(trc_out, "dec %ld\n", rr->length);
+        BIO_printf(trc_out, "dec %zd\n", rr->length);
         BIO_dump_indent(trc_out, rr->data, rr->length, 4);
     } OSSL_TRACE_END(TLS);
 

test/sparse_array_test.c

diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c
index 3457a77..5cc8038 100644
--- a/test/sparse_array_test.c
+++ b/test/sparse_array_test.c
@@ -122,7 +122,7 @@
             doall_data->res = 1;
             return;
         }
-    TEST_error("Index %zu with value %s not found", n, value);
+    TEST_error("Index %ju with value %s not found", n, value);
 }
 
 static void leaf_delete(ossl_uintmax_t n, char *value, void *arg)
@@ -138,7 +138,7 @@
             ossl_sa_char_set(doall_data->sa, n, NULL);
             return;
         }
-    TEST_error("Index %zu with value %s not found", n, value);
+    TEST_error("Index %ju with value %s not found", n, value);
 }
 
 static int test_sparse_array_doall(void)