mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

RT3984: Fix clang compiler warning on Mac OS X where %ld is used for uint64_t.

Browse Source 
clang suggests %llu instead, but it isn't clear that is portable on
all platforms.

C99 and above define a handy macro for us, so we try to use that
definition and fall back to current definition if needed (though we
switch to 'u' for unsigned).

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Adam Eijdenberg 2015-08-04 19:08:22 -07:00 committed by Emilia Kasper
parent 08a721ac61
commit fb029cebae
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/enc.c
View File

@ -567,8 +567,8 @@ int enc_main(int argc, char **argv)
ret = 0;
if (verbose) {
BIO_printf(bio_err, "bytes read :%8ld\n", BIO_number_read(in));
BIO_printf(bio_err, "bytes written:%8ld\n", BIO_number_written(out));
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));
}
end:
ERR_print_errors(bio_err);

2
apps/s_client.c
View File

@ -2092,7 +2092,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
ssl_print_tmp_key(bio, s);
BIO_printf(bio,
"---\nSSL handshake has read %ld bytes and written %ld bytes\n",
"---\nSSL handshake has read %"PRIu64" bytes and written %"PRIu64" bytes\n",
BIO_number_read(SSL_get_rbio(s)),
BIO_number_written(SSL_get_wbio(s)));
}

16
include/openssl/e_os2.h
View File

@ -294,6 +294,22 @@ typedef unsigned __int64 uint64_t;
# include <stdint.h>
# endif
/*
* We need a format operator for some client tools for uint64_t.
* This is an attempt at doing so in a portable manner.
* If we can't use a built-in definition, we'll revert to the previous
* behavior that was hard-coded but now causing compiler warnings on
* some systems (e.g. Mac OS X).
*/
# ifndef PRIu64
# if (__STDC_VERSION__ >= 199901L)
# include <inttypes.h>
# endif
# ifndef PRIu64
# define PRIu64 "lu"
# endif
# endif
#ifdef __cplusplus
}
#endif