diff options
| author | Thomas Ulmer <thomasmulmer02@gmail.com> | 2026-06-23 21:34:41 -0700 |
|---|---|---|
| committer | Thomas Ulmer <thomasmulmer02@gmail.com> | 2026-06-23 21:34:41 -0700 |
| commit | 874d317334fae1ddce316f9b6f4d0ce4e434bf52 (patch) | |
| tree | 929f924d3c3696d3aa9917aca0e7048bbe3e93e8 /libuxre/bracket.c | |
| parent | 15bd7946cc838a3151c357e4b0bc1ab85eecda62 (diff) | |
heirloom vi fixes from arch AUR
Diffstat (limited to 'libuxre/bracket.c')
| -rw-r--r-- | libuxre/bracket.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libuxre/bracket.c b/libuxre/bracket.c index bc31b23..cb8db72 100644 --- a/libuxre/bracket.c +++ b/libuxre/bracket.c @@ -130,6 +130,7 @@ place(Bracket *bp, wchar_t wc, w_type prev, int mb_cur_max) CollElem spare; int ret; + (void)mb_cur_max; if ((cep = libuxre_collelem(bp->col, &spare, wc)) != ELEM_ENCODED) { if (cep == ELEM_BADCHAR) @@ -338,7 +339,7 @@ eqcls(Bracket *bp, const unsigned char *s, int n, w_type prev, int mb_cur_max) * Permit ranges up to the first and * after the last. */ - if (prev > 0 && prev != cep->weight[0] + if (prev > 0 && (unsigned)prev != cep->weight[0] && (prev = addrange(bp, cep->weight[0], prev)) != 0) { @@ -426,7 +427,7 @@ LIBUXRE_STATIC int libuxre_bktmbcomp(Bracket *bp, const unsigned char *pat0, int flags, int mb_cur_max) { - static const Bracket zero = {0}; + static const Bracket zero; const unsigned char *pat = pat0; struct lc_collate *savecol; w_type n, wc, prev = 0; @@ -709,11 +710,12 @@ libuxre_bktmbexec(Bracket *bp, wchar_t wc, } for (;;) { - if (iswctype(mb_cur_max==1?btowc(wc):wc, *wctp)) + if (iswctype(mb_cur_max == 1 ? btowc(wc) + : (wint_t)wc, *wctp)) goto match; if (wc != mcbuf.ch && - iswctype(mb_cur_max==1?btowc(mcbuf.ch):mcbuf.ch, - *wctp)) + iswctype(mb_cur_max == 1 ? btowc(mcbuf.ch) + : (wint_t)mcbuf.ch, *wctp)) goto match; if (--i == 0) break; @@ -801,7 +803,7 @@ libuxre_bktmbexec(Bracket *bp, wchar_t wc, mcbuf.wc = mcbuf.cep->weight[1]; for (;;) { - if (mcbuf.wc == *wucp) + if ((wuchar_type)mcbuf.wc == *wucp) goto match; if (--i == 0) break; |