blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

utf8_to_egc: cast wchar_t to unsigned for logging

Browse Source
This commit is contained in:
nick black 2021-12-04 02:55:53 -05:00
parent 6080de837a
commit 6f3ba8c3dd
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/egcpool.h
View File

@ -127,7 +127,7 @@ utf8_egc_len(const char* gcluster, int* colcount){
}
cols = 1;
if(iswcntrl(wc)){
logerror("prohibited or invalid Unicode: 0x%x\n", wc);
logerror("prohibited or invalid unicode: 0x%08x\n", (unsigned)wc);
return -1;
}
}
@ -245,12 +245,12 @@ egcpool_stash(egcpool* pool, const char* egc, size_t ulen){
static inline bool
egcpool_check_validity(const egcpool* pool, int offset){
if(offset >= pool->poolsize){
fprintf(stderr, "Offset 0x%06x greater than size (%d)\n", offset, pool->poolsize);
fprintf(stderr, "offset 0x%06x greater than size (%d)\n", offset, pool->poolsize);
return false;
}
const char* egc = pool->pool + offset;
if(*egc == '\0'){
fprintf(stderr, "Bad offset 0x%06x: empty\n", offset);
fprintf(stderr, "bad offset 0x%06x: empty\n", offset);
return false;
}
mbstate_t mbstate;
@ -259,7 +259,7 @@ egcpool_check_validity(const egcpool* pool, int offset){
wchar_t wcs;
int r = mbrtowc(&wcs, egc, strlen(egc), &mbstate);
if(r < 0){
fprintf(stderr, "Invalid UTF8 at offset 0x%06x [%s]\n", offset, strerror(errno));
fprintf(stderr, "invalid utf8 at offset 0x%06x [%s]\n", offset, strerror(errno));
return false;
}
egc += r;