summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-07-27 16:53:44 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-07-27 16:53:44 +0000
commitc1430bff061b29a2033dedf671e589f9c03a1504 (patch)
tree01ee1120caff6dadc57a18dd3f3bbe6577c12a4f
parent8337f7abf6c4e45325d634d1a45a9918b70a77c5 (diff)
s/comparision/comparison/g; netbsd
-rw-r--r--usr.bin/xlint/lint1/decl.c6
-rw-r--r--usr.bin/xlint/lint1/err.c12
-rw-r--r--usr.bin/xlint/lint1/tree.c26
-rw-r--r--usr.bin/xlint/lint2/chk.c10
4 files changed, 27 insertions, 27 deletions
diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c
index 375fc782c16..5524f95d53c 100644
--- a/usr.bin/xlint/lint1/decl.c
+++ b/usr.bin/xlint/lint1/decl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: decl.c,v 1.2 1996/06/26 05:44:09 deraadt Exp $ */
+/* $OpenBSD: decl.c,v 1.3 1998/07/27 16:53:39 deraadt Exp $ */
/* $NetBSD: decl.c,v 1.11 1995/10/02 17:34:16 jpo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: decl.c,v 1.2 1996/06/26 05:44:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: decl.c,v 1.3 1998/07/27 16:53:39 deraadt Exp $";
#endif
#include <sys/param.h>
@@ -2004,7 +2004,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
diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c
index 0e43b2d5dbe..ebe82b21094 100644
--- a/usr.bin/xlint/lint1/err.c
+++ b/usr.bin/xlint/lint1/err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.c,v 1.2 1996/06/26 05:44:11 deraadt Exp $ */
+/* $OpenBSD: err.c,v 1.3 1998/07/27 16:53:40 deraadt Exp $ */
/* $NetBSD: err.c,v 1.8 1995/10/02 17:37:00 jpo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: err.c,v 1.2 1996/06/26 05:44:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: err.c,v 1.3 1998/07/27 16:53:40 deraadt Exp $";
#endif
/* number of errors found */
@@ -219,7 +219,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 */
@@ -287,7 +287,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 */
@@ -300,7 +300,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 */
@@ -331,7 +331,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 */
diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c
index bad831d8577..8f3ed920dfb 100644
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.2 1996/06/26 05:44:19 deraadt Exp $ */
+/* $OpenBSD: tree.c,v 1.3 1998/07/27 16:53:41 deraadt Exp $ */
/* $NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: tree.c,v 1.2 1996/06/26 05:44:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tree.c,v 1.3 1998/07/27 16:53:41 deraadt Exp $";
#endif
#include <stdlib.h>
@@ -566,7 +566,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
@@ -992,7 +992,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 +1165,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 +1396,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
}
@@ -3674,7 +3674,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)
@@ -3697,25 +3697,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;
@@ -3723,11 +3723,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;
diff --git a/usr.bin/xlint/lint2/chk.c b/usr.bin/xlint/lint2/chk.c
index d815b666b77..66a8cfd8ca8 100644
--- a/usr.bin/xlint/lint2/chk.c
+++ b/usr.bin/xlint/lint2/chk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chk.c,v 1.3 1997/09/08 08:43:17 deraadt Exp $ */
+/* $OpenBSD: chk.c,v 1.4 1998/07/27 16:53:43 deraadt Exp $ */
/* $NetBSD: chk.c,v 1.2 1995/07/03 21:24:42 cgd Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: chk.c,v 1.3 1997/09/08 08:43:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: chk.c,v 1.4 1998/07/27 16:53:43 deraadt Exp $";
#endif
#include <stdlib.h>
@@ -443,7 +443,7 @@ chkfaui(hte, def, decl)
return;
/*
- * If we find a function definition, we use this for comparision,
+ * If we find a function definition, we use this for comparison,
* otherwise the first prototype we can find. If there is no
* definition or prototype declaration, the first function call
* is used.
@@ -1281,8 +1281,8 @@ chkadecl(hte, def, decl)
*
* ignqual if set, ignore qualifiers of outhermost type; used for
* function arguments
- * promote if set, promote left type before comparision; used for
- * comparisions of arguments with parameters of old style
+ * promote if set, promote left type before comparison; used for
+ * comparisons of arguments with parameters of old style
* definitions
* asgn left indirected type must have at least the same qualifiers
* like right indirected type (for assignments and function