From 174c4e269f025f44290558c05acb2516a61c0c79 Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 5 Oct 2021 04:55:44 -0400 Subject: [PATCH] logging: convert some %jxen to PRIx64 --- src/lib/direct.c | 2 +- src/lib/fd.c | 2 +- src/lib/menu.c | 2 +- src/lib/plot.c | 2 +- src/lib/reader.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/direct.c b/src/lib/direct.c index 008d98b38..f8eca0758 100644 --- a/src/lib/direct.c +++ b/src/lib/direct.c @@ -861,7 +861,7 @@ ncdirect* ncdirect_core_init(const char* termtype, FILE* outfp, uint64_t flags){ outfp = stdout; } if(flags > (NCDIRECT_OPTION_DRAIN_INPUT << 1)){ // allow them through with warning - logwarn("Passed unsupported flags 0x%016jx\n", (uintmax_t)flags); + logwarn("Passed unsupported flags 0x%016" PRIx64 "\n", flags); } if(termtype){ if(putenv_term(termtype)){ diff --git a/src/lib/fd.c b/src/lib/fd.c index 04e94f939..357de96ef 100644 --- a/src/lib/fd.c +++ b/src/lib/fd.c @@ -349,7 +349,7 @@ ncexecvpe(ncplane* n, const ncsubproc_options* opts, unsigned usepath, return NULL; } if(opts->flags > 0){ - logwarn("Provided unsupported flags %016jx\n", (uintmax_t)opts->flags); + logwarn("Provided unsupported flags %016" PRIx64 "\n", opts->flags); } #ifndef __MINGW64__ int fd = -1; diff --git a/src/lib/menu.c b/src/lib/menu.c index 9886f14ec..273f3f99f 100644 --- a/src/lib/menu.c +++ b/src/lib/menu.c @@ -348,7 +348,7 @@ ncmenu* ncmenu_create(ncplane* n, const ncmenu_options* opts){ return NULL; } if(opts->flags >= (NCMENU_OPTION_HIDING << 1u)){ - logwarn("Provided unsupported flags %016jx\n", (uintmax_t)opts->flags); + logwarn("Provided unsupported flags %016" PRIx64 "\n", opts->flags); } int totalheight = 1; int totalwidth = 2; // start with two-character margin on the left diff --git a/src/lib/plot.c b/src/lib/plot.c index b5ec83ce8..6e0579fb3 100644 --- a/src/lib/plot.c +++ b/src/lib/plot.c @@ -413,7 +413,7 @@ create_##T(nc##X##plot* ncpp, ncplane* n, const ncplot_options* opts, const T mi opts = &zeroed; \ } \ if(opts->flags >= (NCPLOT_OPTION_PRINTSAMPLE << 1u)){ \ - logwarn("Provided unsupported flags %016jx\n", (uintmax_t)opts->flags); \ + logwarn("Provided unsupported flags %016" PRIx64 "\n", opts->flags); \ } \ /* if miny == maxy (enabling domain detection), they both must be equal to 0 */ \ if(miny == maxy && miny){ \ diff --git a/src/lib/reader.c b/src/lib/reader.c index b99341cf4..7a04f7ae7 100644 --- a/src/lib/reader.c +++ b/src/lib/reader.c @@ -6,7 +6,7 @@ ncreader* ncreader_create(ncplane* n, const ncreader_options* opts){ opts = &zeroed; } if(opts->flags > NCREADER_OPTION_CURSOR){ - logwarn("Provided unsupported flags %016jx\n", (uintmax_t)opts->flags); + logwarn("Provided unsupported flags %016" PRIx64 "\n", opts->flags); } ncreader* nr = malloc(sizeof(*nr)); if(nr == NULL){