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

Fix spelling of comparison (was: comparision).

Browse Source 
Add $FreeBSD$.

Obtained from:	NetBSD/OpenBSD
This commit is contained in:
Jeroen Ruigrok van der Werven 2001-04-19 11:10:51 +00:00
parent 24695f0617
commit 9d083950b7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=75697
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/xlint/lint1/decl.c
View File

@ -29,6 +29,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef lint
@ -2004,7 +2006,7 @@ isredec(dsym, warn)
* Checks if two types are compatible. Returns 0 if not, otherwise 1.
*
* ignqual ignore qualifiers of type; used for function params
* promot promote left type; used for comparision of params of
* promot promote left type; used for comparison of params of
* old style function definitions with params of prototypes.
* *warn set to 1 if an old style function declaration is not
* compatible with a prototype

10
usr.bin/xlint/lint1/err.c
View File

@ -29,6 +29,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef lint
@ -218,7 +220,7 @@ const char *msgs[] = {
"assignment in conditional context", /* 159 */
"operator '==' found where '=' was expected", /* 160 */
"constant in conditional context", /* 161 */
"comparision of %s with %s, op %s", /* 162 */
"comparison of %s with %s, op %s", /* 162 */
"a cast does not yield an lvalue", /* 163 */
"assignment of negative constant to unsigned type", /* 164 */
"constant truncated by assignment", /* 165 */
@ -286,7 +288,7 @@ const char *msgs[] = {
"const object %s should have initializer", /* 227 */
"function cannot return const or volatile object", /* 228 */
"questionable conversion of function pointer", /* 229 */
"nonportable character comparision, op %s", /* 230 */
"nonportable character comparison, op %s", /* 230 */
"argument %s unused in function %s", /* 231 */
"label %s unused in function %s", /* 232 */
"struct %s never defined", /* 233 */
@ -299,7 +301,7 @@ const char *msgs[] = {
"assignment of different structures", /* 240 */
"dubious operation on enum, op %s", /* 241 */
"combination of '%s' and '%s', op %s", /* 242 */
"dubious comparision of enums, op %s", /* 243 */
"dubious comparison of enums, op %s", /* 243 */
"illegal structure pointer combination", /* 244 */
"illegal structure pointer combination, op %s", /* 245 */
"dubious conversion of enum to '%s'", /* 246 */
@ -330,7 +332,7 @@ const char *msgs[] = {
"switch expression must be of type `int' in traditional C", /* 271 */
"empty translation unit", /* 272 */
"bit-field type '%s' invalid in ANSI C", /* 273 */
"ANSI C forbids comparision of %s with %s", /* 274 */
"ANSI C forbids comparison of %s with %s", /* 274 */
"cast discards 'const' from pointer target type", /* 275 */
"", /* 276 */
"initialisation of '%s' with '%s'", /* 277 */

24
usr.bin/xlint/lint1/tree.c
View File

@ -29,6 +29,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef lint
@ -565,7 +567,7 @@ build(op, ln, rn)
rn = cconv(rn);
/*
* Print some warnings for comparisions of unsigned values with
* Print some warnings for comparisons of unsigned values with
* constants lower than or equal to null. This must be done
* before promote() because otherwise unsigned char and unsigned
* short would be promoted to int. Also types are tested to be
@ -991,7 +993,7 @@ typeok(op, arg, ln, rn)
case NE:
/*
* Accept some things which are allowed with EQ and NE,
* but not with ordered comparisions.
* but not with ordered comparisons.
*/
if (lt == PTR && ((rt == PTR && rst == VOID) || isityp(rt))) {
if (rn->tn_op == CON && rn->tn_val->v_quad == 0)
@ -1165,7 +1167,7 @@ ptrcmpok(op, ln, rn)
/* (void *)0 already handled in typeok() */
*(lt == FUNC ? &lts : &rts) = "function pointer";
*(lt == VOID ? &lts : &rts) = "'void *'";
/* ANSI C forbids comparision of %s with %s */
/* ANSI C forbids comparison of %s with %s */
warning(274, lts, rts);
}
return;
@ -1396,7 +1398,7 @@ chkeop2(op, arg, ln, rn)
#if 0
} else if (mp->m_comp && op != EQ && op != NE) {
if (eflag)
/* dubious comparisions of enums */
/* dubious comparisons of enums */
warning(243, mp->m_name);
#endif
}
@ -3675,7 +3677,7 @@ chkaidx(tn, amper)
}
/*
* Check for ordered comparisions of unsigned values with 0.
* Check for ordered comparisons of unsigned values with 0.
*/
static void
chkcomp(op, ln, rn)
@ -3698,25 +3700,25 @@ chkcomp(op, ln, rn)
if ((hflag || pflag) && lt == CHAR && rn->tn_op == CON &&
(rn->tn_val->v_quad < 0 ||
rn->tn_val->v_quad > ~(~0 << (CHAR_BIT - 1)))) {
/* nonportable character comparision, op %s */
/* nonportable character comparison, op %s */
warning(230, mp->m_name);
return;
}
if ((hflag || pflag) && rt == CHAR && ln->tn_op == CON &&
(ln->tn_val->v_quad < 0 ||
ln->tn_val->v_quad > ~(~0 << (CHAR_BIT - 1)))) {
/* nonportable character comparision, op %s */
/* nonportable character comparison, op %s */
warning(230, mp->m_name);
return;
}
if (isutyp(lt) && !isutyp(rt) &&
rn->tn_op == CON && rn->tn_val->v_quad <= 0) {
if (rn->tn_val->v_quad < 0) {
/* comparision of %s with %s, op %s */
/* comparison of %s with %s, op %s */
warning(162, tyname(ln->tn_type), "negative constant",
mp->m_name);
} else if (op == LT || op == GE || (hflag && op == LE)) {
/* comparision of %s with %s, op %s */
/* comparison of %s with %s, op %s */
warning(162, tyname(ln->tn_type), "0", mp->m_name);
}
return;
@ -3724,11 +3726,11 @@ chkcomp(op, ln, rn)
if (isutyp(rt) && !isutyp(lt) &&
ln->tn_op == CON && ln->tn_val->v_quad <= 0) {
if (ln->tn_val->v_quad < 0) {
/* comparision of %s with %s, op %s */
/* comparison of %s with %s, op %s */
warning(162, "negative constant", tyname(rn->tn_type),
mp->m_name);
} else if (op == GT || op == LE || (hflag && op == GE)) {
/* comparision of %s with %s, op %s */
/* comparison of %s with %s, op %s */
warning(162, "0", tyname(rn->tn_type), mp->m_name);
}
return;