generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-24 02:51:43 +01:00
Code Issues Projects Releases Wiki Activity

Use CHAR_BIT instead of NBBY in strnvis()

Browse Source 
<sys/param.h> is not available on Windows.

Signed-off-by: Guillem Jover <guillem@hadrons.org>
This commit is contained in:
Aaron Dierking 2018-06-14 11:38:31 -07:00 committed by Guillem Jover
parent 81c3c3e405
commit b9dee9f69a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vis.c
View File

@ -57,7 +57,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h>
#include <assert.h> #include <assert.h>
#pragma GCC diagnostic push #pragma GCC diagnostic push
@ -308,7 +307,7 @@ do_svis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
/* See comment in istrsenvisx() output loop, below. */ /* See comment in istrsenvisx() output loop, below. */
wmsk = 0; wmsk = 0;
for (i = sizeof(wmsk) - 1; i >= 0; i--) { for (i = sizeof(wmsk) - 1; i >= 0; i--) {
shft = i * NBBY; shft = i * CHAR_BIT;
bmsk = (uint64_t)0xffLL << shft; bmsk = (uint64_t)0xffLL << shft;
wmsk |= bmsk; wmsk |= bmsk;
if ((c & wmsk) || i == 0) if ((c & wmsk) || i == 0)
@ -539,7 +538,7 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *mbsrc, size_t mblength,
clen = 0; clen = 0;
wmsk = 0; wmsk = 0;
for (i = sizeof(wmsk) - 1; i >= 0; i--) { for (i = sizeof(wmsk) - 1; i >= 0; i--) {
shft = i * NBBY; shft = i * CHAR_BIT;
bmsk = (uint64_t)0xffLL << shft; bmsk = (uint64_t)0xffLL << shft;
wmsk |= bmsk; wmsk |= bmsk;
if ((*dst & wmsk) || i == 0) if ((*dst & wmsk) || i == 0)