Archives
/
notcurses
mirror of https://github.com/dankamongmen/notcurses
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

32-bit fixes for various diagnostics

Browse Source
pull/1145/head
nick black 4 years ago
parent be6362d74f
commit 725ecc9267
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
src/lib/blit.c
Unescape Escape View File

@ -844,7 +844,7 @@ int ncblit_bgrx(const void* data, int linesize, const struct ncvisual_options* v
int ncblit_rgba(const void* data, int linesize, const struct ncvisual_options* vopts){ int ncblit_rgba(const void* data, int linesize, const struct ncvisual_options* vopts){
if(vopts->flags > NCVISUAL_OPTION_BLEND){ if(vopts->flags > NCVISUAL_OPTION_BLEND){
fprintf(stderr, "Warning: unknown ncvisual options %016lx\n", vopts->flags); fprintf(stderr, "Warning: unknown ncvisual options %016jx\n", (uintmax_t)vopts->flags);
} }
if(linesize <= 0 || (size_t)linesize < vopts->lenx * sizeof(uint32_t)){ if(linesize <= 0 || (size_t)linesize < vopts->lenx * sizeof(uint32_t)){
return -1; return -1;

8
src/lib/fd.c
Unescape Escape View File

@ -101,7 +101,7 @@ ncfdplane_create_internal(ncplane* n, const ncfdplane_options* opts, int fd,
ncfdplane_callback cbfxn, ncfdplane_done_cb donecbfxn, ncfdplane_callback cbfxn, ncfdplane_done_cb donecbfxn,
bool thread){ bool thread){
if(opts->flags > 0){ if(opts->flags > 0){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", opts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)opts->flags);
} }
ncfdplane* ret = malloc(sizeof(*ret)); ncfdplane* ret = malloc(sizeof(*ret));
if(ret == NULL){ if(ret == NULL){
@ -302,7 +302,7 @@ ncsubproc* ncsubproc_createv(ncplane* n, const ncsubproc_options* opts,
return NULL; return NULL;
} }
if(opts->flags > 0){ if(opts->flags > 0){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", opts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)opts->flags);
} }
int fd = -1; int fd = -1;
ncsubproc* ret = malloc(sizeof(*ret)); ncsubproc* ret = malloc(sizeof(*ret));
@ -337,7 +337,7 @@ ncsubproc* ncsubproc_createvp(ncplane* n, const ncsubproc_options* opts,
return NULL; return NULL;
} }
if(opts->flags > 0){ if(opts->flags > 0){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", opts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)opts->flags);
} }
int fd = -1; int fd = -1;
ncsubproc* ret = malloc(sizeof(*ret)); ncsubproc* ret = malloc(sizeof(*ret));
@ -372,7 +372,7 @@ ncsubproc* ncsubproc_createvpe(ncplane* n, const ncsubproc_options* opts,
return NULL; return NULL;
} }
if(opts->flags > 0){ if(opts->flags > 0){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", opts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)opts->flags);
} }
int fd = -1; int fd = -1;
ncsubproc* ret = malloc(sizeof(*ret)); ncsubproc* ret = malloc(sizeof(*ret));

4
src/lib/linux.c
Unescape Escape View File

@ -458,11 +458,11 @@ program_block_drawing_chars(const notcurses* nc, struct consolefontdesc* cfd,
} }
} }
if(candidate == 0){ if(candidate == 0){
logwarn(nc, "Ran out of replaceable glyphs for U+%04x\n", shimmers[s].w); logwarn(nc, "Ran out of replaceable glyphs for U+%04lx\n", (long)shimmers[s].w);
return -1; return -1;
} }
if(shimmers[s].glyphfxn(cfd, candidate)){ if(shimmers[s].glyphfxn(cfd, candidate)){
logwarn(nc, "Error replacing glyph for U+%04x at %u\n", shimmers[s].w, candidate); logwarn(nc, "Error replacing glyph for U+%04lx at %u\n", (long)shimmers[s].w, candidate);
return -1; return -1;
} }
if(add_to_map(nc, map, shimmers[s].w, candidate)){ if(add_to_map(nc, map, shimmers[s].w, candidate)){

2
src/lib/menu.c
Unescape Escape View File

@ -306,7 +306,7 @@ ncmenu* ncmenu_create(ncplane* n, const ncmenu_options* opts){
return NULL; return NULL;
} }
if(opts->flags > NCMENU_OPTION_HIDING){ if(opts->flags > NCMENU_OPTION_HIDING){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", opts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)opts->flags);
} }
int totalheight = 1; int totalheight = 1;
int totalwidth = 2; // start with two-character margin on the left int totalwidth = 2; // start with two-character margin on the left

4
src/lib/notcurses.c
Unescape Escape View File

@ -337,7 +337,7 @@ make_ncpile(notcurses* nc, ncplane* n){
ncplane* ncplane_new_internal(notcurses* nc, ncplane* n, ncplane* ncplane_new_internal(notcurses* nc, ncplane* n,
const ncplane_options* nopts){ const ncplane_options* nopts){
if(nopts->flags > NCPLANE_OPTION_HORALIGNED){ if(nopts->flags > NCPLANE_OPTION_HORALIGNED){
logwarn(nc, "Provided unsupported flags %016lx\n", nopts->flags); logwarn(nc, "Provided unsupported flags %016jx\n", (uintmax_t)nopts->flags);
} }
if(nopts->rows <= 0 || nopts->cols <= 0){ if(nopts->rows <= 0 || nopts->cols <= 0){
logerror(nc, "Won't create denormalized plane (r=%d, c=%d)\n", logerror(nc, "Won't create denormalized plane (r=%d, c=%d)\n",
@ -985,7 +985,7 @@ notcurses* notcurses_init(const notcurses_options* opts, FILE* outfp){
return NULL; return NULL;
} }
if(opts->flags >= (NCOPTION_NO_FONT_CHANGES << 1u)){ if(opts->flags >= (NCOPTION_NO_FONT_CHANGES << 1u)){
fprintf(stderr, "Warning: unknown Notcurses options %016lx\n", opts->flags); fprintf(stderr, "Warning: unknown Notcurses options %016jx\n", (uintmax_t)opts->flags);
} }
notcurses* ret = malloc(sizeof(*ret)); notcurses* ret = malloc(sizeof(*ret));
if(ret == NULL){ if(ret == NULL){

2
src/lib/plot.h
Unescape Escape View File

@ -21,7 +21,7 @@ class ncppplot {
opts = &zeroed; opts = &zeroed;
} }
if(opts->flags > NCPLOT_OPTION_DETECTMAXONLY){ if(opts->flags > NCPLOT_OPTION_DETECTMAXONLY){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", opts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)opts->flags);
} }
//struct notcurses* nc = n->nc; //struct notcurses* nc = n->nc;
// if miny == maxy (enabling domain detection), they both must be equal to 0 // if miny == maxy (enabling domain detection), they both must be equal to 0

2
src/lib/reader.c
Unescape Escape View File

@ -6,7 +6,7 @@ ncreader* ncreader_create(ncplane* n, const ncreader_options* opts){
opts = &zeroed; opts = &zeroed;
} }
if(opts->flags > NCREADER_OPTION_CURSOR){ if(opts->flags > NCREADER_OPTION_CURSOR){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", opts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)opts->flags);
} }
ncreader* nr = malloc(sizeof(*nr)); ncreader* nr = malloc(sizeof(*nr));
if(nr == NULL){ if(nr == NULL){

2
src/lib/reel.c
Unescape Escape View File

@ -718,7 +718,7 @@ validate_ncreel_opts(ncplane* n, const ncreel_options* ropts){
return false; return false;
} }
if(ropts->flags > NCREEL_OPTION_CIRCULAR){ if(ropts->flags > NCREEL_OPTION_CIRCULAR){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", ropts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)ropts->flags);
} }
if(ropts->flags & NCREEL_OPTION_CIRCULAR){ if(ropts->flags & NCREEL_OPTION_CIRCULAR){
if(!(ropts->flags & NCREEL_OPTION_INFINITESCROLL)){ if(!(ropts->flags & NCREEL_OPTION_INFINITESCROLL)){

2
src/lib/selector.c
Unescape Escape View File

@ -833,7 +833,7 @@ ncmultiselector* ncmultiselector_create(ncplane* n, const ncmultiselector_option
opts = &zeroed; opts = &zeroed;
} }
if(opts->flags > 0){ if(opts->flags > 0){
logwarn(ncplane_notcurses(n), "Provided unsupported flags %016lx\n", opts->flags); logwarn(ncplane_notcurses(n), "Provided unsupported flags %016jx\n", (uintmax_t)opts->flags);
} }
unsigned itemcount = 0; unsigned itemcount = 0;
if(opts->items){ if(opts->items){

2
src/lib/visual.cpp
Unescape Escape View File

@ -364,7 +364,7 @@ auto ncvisual_from_bgra(const void* bgra, int rows, int rowstride,
auto ncvisual_render(notcurses* nc, ncvisual* ncv, auto ncvisual_render(notcurses* nc, ncvisual* ncv,
const struct ncvisual_options* vopts) -> ncplane* { const struct ncvisual_options* vopts) -> ncplane* {
if(vopts && vopts->flags > NCVISUAL_OPTION_BLEND){ if(vopts && vopts->flags > NCVISUAL_OPTION_BLEND){
fprintf(stderr, "Warning: unknown ncvisual options %016lx\n", vopts->flags); fprintf(stderr, "Warning: unknown ncvisual options %016jx\n", (uintmax_t)vopts->flags);
} }
int lenx = vopts ? vopts->lenx : 0; int lenx = vopts ? vopts->lenx : 0;
int leny = vopts ? vopts->leny : 0; int leny = vopts ? vopts->leny : 0;

2
src/poc/wcwidth.c
Unescape Escape View File

@ -21,7 +21,7 @@ int main(int argc, char **argv){
return EXIT_FAILURE; return EXIT_FAILURE;
} }
int width = wcwidth(w); int width = wcwidth(w);
printf("w(0x%05x): %d %lc\n", w, width, w); printf("w(0x%05lx): %d %lc\n", (long)w, width, w);
arg += conv; arg += conv;
} }
} }

Write Preview
Loading…
Cancel
Save