d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build tr(1) with WARNS=6.

Browse Source
This commit is contained in:
ed 2011-10-14 07:25:20 +00:00
parent 9a877f97e7
commit c532eb5b65
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/tr/Makefile
View File

@ -4,6 +4,4 @@
PROG= tr
SRCS= cmap.c cset.c str.c tr.c
WARNS?= 1
.include <bsd.prog.mk>

4
usr.bin/tr/cset.c
View File

@ -153,11 +153,11 @@ cset_in_hard(struct cset *cs, wchar_t ch)
struct csclass *csc;
for (csc = cs->cs_classes; csc != NULL; csc = csc->csc_next)
if (csc->csc_invert ^ iswctype(ch, csc->csc_type) != 0)
if ((csc->csc_invert ^ iswctype(ch, csc->csc_type)) != 0)
return (cs->cs_invert ^ true);
if (cs->cs_root != NULL) {
cs->cs_root = cset_splay(cs->cs_root, ch);
return (cs->cs_invert ^ cset_rangecmp(cs->cs_root, ch) == 0);
return ((cs->cs_invert ^ cset_rangecmp(cs->cs_root, ch)) == 0);
}
return (cs->cs_invert ^ false);
}

15
usr.bin/tr/str.c
View File

@ -57,8 +57,7 @@ static int genrange(STR *, int);
static void genseq(STR *);
wint_t
next(s)
STR *s;
next(STR *s)
{
int is_octal;
wint_t ch;
@ -135,8 +134,7 @@ next(s)
}
static int
bracket(s)
STR *s;
bracket(STR *s)
{
char *p;
@ -173,8 +171,7 @@ bracket(s)
}
static void
genclass(s)
STR *s;
genclass(STR *s)
{
if ((s->cclass = wctype(s->str)) == 0)
@ -190,8 +187,7 @@ genclass(s)
}
static void
genequiv(s)
STR *s;
genequiv(STR *s)
{
int i, p, pri;
char src[2], dst[3];
@ -295,8 +291,7 @@ genrange(STR *s, int was_octal)
}
static void
genseq(s)
STR *s;
genseq(STR *s)
{
char *ep;
wchar_t wc;