Module Name: src Committed By: rillig Date: Mon Feb 22 15:09:50 UTC 2021
Modified Files: src/tests/usr.bin/xlint/lint1: d_c99_init.exp d_struct_init_nested.exp msg_175.c msg_175.exp msg_185.c msg_186.c msg_186.exp msg_210.c msg_210.exp msg_221.c msg_221.exp msg_238.c msg_277.c src/usr.bin/xlint/lint1: decl.c err.c func.c init.c lex.c lint1.h tree.c src/usr.bin/xlint/lint2: chk.c emit2.c Log Message: lint: change spelling of initialisation to initialization That's the wording from the ISO C99 standard. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/d_c99_init.exp \ src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_175.c \ src/tests/usr.bin/xlint/lint1/msg_175.exp \ src/tests/usr.bin/xlint/lint1/msg_185.c \ src/tests/usr.bin/xlint/lint1/msg_186.exp \ src/tests/usr.bin/xlint/lint1/msg_221.exp \ src/tests/usr.bin/xlint/lint1/msg_238.c \ src/tests/usr.bin/xlint/lint1/msg_277.c cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_186.c \ src/tests/usr.bin/xlint/lint1/msg_210.c \ src/tests/usr.bin/xlint/lint1/msg_210.exp \ src/tests/usr.bin/xlint/lint1/msg_221.c cvs rdiff -u -r1.137 -r1.138 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.80 -r1.81 src/usr.bin/xlint/lint1/err.c cvs rdiff -u -r1.72 -r1.73 src/usr.bin/xlint/lint1/func.c cvs rdiff -u -r1.88 -r1.89 src/usr.bin/xlint/lint1/init.c cvs rdiff -u -r1.8 -r1.9 src/usr.bin/xlint/lint1/lex.c cvs rdiff -u -r1.65 -r1.66 src/usr.bin/xlint/lint1/lint1.h cvs rdiff -u -r1.217 -r1.218 src/usr.bin/xlint/lint1/tree.c cvs rdiff -u -r1.38 -r1.39 src/usr.bin/xlint/lint2/chk.c cvs rdiff -u -r1.16 -r1.17 src/usr.bin/xlint/lint2/emit2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/tests/usr.bin/xlint/lint1/d_c99_init.exp diff -u src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.4 src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.5 --- src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.4 Sun Feb 21 13:10:57 2021 +++ src/tests/usr.bin/xlint/lint1/d_c99_init.exp Mon Feb 22 15:09:50 2021 @@ -1,3 +1,3 @@ d_c99_init.c(22): invalid initializer type int [176] d_c99_init.c(23): too many initializers [174] -d_c99_init.c(49): initialisation type mismatch (pointer to const void) and (struct any) [185] +d_c99_init.c(49): initialization type mismatch (pointer to const void) and (struct any) [185] Index: src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp diff -u src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp:1.4 src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp:1.5 --- src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp:1.4 Sun Feb 21 10:28:33 2021 +++ src/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -d_struct_init_nested.c(35): initialisation type mismatch (enum I1) and (struct Inner1) [185] +d_struct_init_nested.c(35): initialization type mismatch (enum I1) and (struct Inner1) [185] d_struct_init_nested.c(37): too many struct/union initializers [172] -d_struct_init_nested.c(62): initialisation type mismatch (enum I1) and (struct Inner2) [185] -d_struct_init_nested.c(64): warning: enum type mismatch between 'enum I2' and 'enum O3' in initialisation [210] +d_struct_init_nested.c(62): initialization type mismatch (enum I1) and (struct Inner2) [185] +d_struct_init_nested.c(64): warning: enum type mismatch between 'enum I2' and 'enum O3' in initialization [210] Index: src/tests/usr.bin/xlint/lint1/msg_175.c diff -u src/tests/usr.bin/xlint/lint1/msg_175.c:1.2 src/tests/usr.bin/xlint/lint1/msg_175.c:1.3 --- src/tests/usr.bin/xlint/lint1/msg_175.c:1.2 Sun Jan 24 16:12:45 2021 +++ src/tests/usr.bin/xlint/lint1/msg_175.c Mon Feb 22 15:09:50 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: msg_175.c,v 1.2 2021/01/24 16:12:45 rillig Exp $ */ +/* $NetBSD: msg_175.c,v 1.3 2021/02/22 15:09:50 rillig Exp $ */ # 3 "msg_175.c" -// Test for message: initialisation of an incomplete type [175] +// Test for message: initialization of an incomplete type [175] struct incomplete; /* expect: 233 */ Index: src/tests/usr.bin/xlint/lint1/msg_175.exp diff -u src/tests/usr.bin/xlint/lint1/msg_175.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_175.exp:1.3 --- src/tests/usr.bin/xlint/lint1/msg_175.exp:1.2 Sun Jan 24 16:12:45 2021 +++ src/tests/usr.bin/xlint/lint1/msg_175.exp Mon Feb 22 15:09:50 2021 @@ -1,3 +1,3 @@ -msg_175.c(8): initialisation of an incomplete type [175] +msg_175.c(8): initialization of an incomplete type [175] msg_175.c(10): incomplete structure or union incomplete: incomplete [31] msg_175.c(6): warning: struct incomplete never defined [233] Index: src/tests/usr.bin/xlint/lint1/msg_185.c diff -u src/tests/usr.bin/xlint/lint1/msg_185.c:1.2 src/tests/usr.bin/xlint/lint1/msg_185.c:1.3 --- src/tests/usr.bin/xlint/lint1/msg_185.c:1.2 Sun Feb 21 09:07:58 2021 +++ src/tests/usr.bin/xlint/lint1/msg_185.c Mon Feb 22 15:09:50 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: msg_185.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */ +/* $NetBSD: msg_185.c,v 1.3 2021/02/22 15:09:50 rillig Exp $ */ # 3 "msg_185.c" -// Test for message: initialisation type mismatch (%s) and (%s) [185] +// Test for message: initialization type mismatch (%s) and (%s) [185] TODO: "Add example code that triggers the above message." /* expect: 249 */ TODO: "Add example code that almost triggers the above message." Index: src/tests/usr.bin/xlint/lint1/msg_186.exp diff -u src/tests/usr.bin/xlint/lint1/msg_186.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_186.exp:1.3 --- src/tests/usr.bin/xlint/lint1/msg_186.exp:1.2 Sun Feb 21 14:49:23 2021 +++ src/tests/usr.bin/xlint/lint1/msg_186.exp Mon Feb 22 15:09:50 2021 @@ -5,4 +5,4 @@ (3): warning: 'long double' is illegal in traditional C [266] (3): warning: 'long double' is illegal in traditional C [266] (3): warning: function prototypes are illegal in traditional C [270] -msg_186.c(16): warning: bit-field initialisation is illegal in traditional C [186] +msg_186.c(16): warning: bit-field initialization is illegal in traditional C [186] Index: src/tests/usr.bin/xlint/lint1/msg_221.exp diff -u src/tests/usr.bin/xlint/lint1/msg_221.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_221.exp:1.3 --- src/tests/usr.bin/xlint/lint1/msg_221.exp:1.2 Thu Jan 7 18:37:41 2021 +++ src/tests/usr.bin/xlint/lint1/msg_221.exp Mon Feb 22 15:09:50 2021 @@ -1 +1 @@ -msg_221.c(10): warning: initialisation of unsigned with negative constant [221] +msg_221.c(10): warning: initialization of unsigned with negative constant [221] Index: src/tests/usr.bin/xlint/lint1/msg_238.c diff -u src/tests/usr.bin/xlint/lint1/msg_238.c:1.2 src/tests/usr.bin/xlint/lint1/msg_238.c:1.3 --- src/tests/usr.bin/xlint/lint1/msg_238.c:1.2 Sun Feb 21 09:07:58 2021 +++ src/tests/usr.bin/xlint/lint1/msg_238.c Mon Feb 22 15:09:50 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: msg_238.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */ +/* $NetBSD: msg_238.c,v 1.3 2021/02/22 15:09:50 rillig Exp $ */ # 3 "msg_238.c" -// Test for message: initialisation of union is illegal in traditional C [238] +// Test for message: initialization of union is illegal in traditional C [238] TODO: "Add example code that triggers the above message." /* expect: 249 */ TODO: "Add example code that almost triggers the above message." Index: src/tests/usr.bin/xlint/lint1/msg_277.c diff -u src/tests/usr.bin/xlint/lint1/msg_277.c:1.2 src/tests/usr.bin/xlint/lint1/msg_277.c:1.3 --- src/tests/usr.bin/xlint/lint1/msg_277.c:1.2 Sun Feb 21 09:07:58 2021 +++ src/tests/usr.bin/xlint/lint1/msg_277.c Mon Feb 22 15:09:50 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: msg_277.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */ +/* $NetBSD: msg_277.c,v 1.3 2021/02/22 15:09:50 rillig Exp $ */ # 3 "msg_277.c" -// Test for message: initialisation of '%s' with '%s' [277] +// Test for message: initialization of '%s' with '%s' [277] TODO: "Add example code that triggers the above message." /* expect: 249 */ TODO: "Add example code that almost triggers the above message." Index: src/tests/usr.bin/xlint/lint1/msg_186.c diff -u src/tests/usr.bin/xlint/lint1/msg_186.c:1.3 src/tests/usr.bin/xlint/lint1/msg_186.c:1.4 --- src/tests/usr.bin/xlint/lint1/msg_186.c:1.3 Sun Feb 21 14:49:23 2021 +++ src/tests/usr.bin/xlint/lint1/msg_186.c Mon Feb 22 15:09:50 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: msg_186.c,v 1.3 2021/02/21 14:49:23 rillig Exp $ */ +/* $NetBSD: msg_186.c,v 1.4 2021/02/22 15:09:50 rillig Exp $ */ # 3 "msg_186.c" -/* Test for message: bit-field initialisation is illegal in traditional C [186] */ +/* Test for message: bit-field initialization is illegal in traditional C [186] */ /* lint1-flags: -tw */ @@ -16,4 +16,4 @@ struct bit_field bit_field = { 3.0, /* expect: 186 */ 2 }; -/* XXX: The message is misleading. Initialisation using integers is ok. */ +/* XXX: The message is misleading. Initialization using integers is ok. */ Index: src/tests/usr.bin/xlint/lint1/msg_210.c diff -u src/tests/usr.bin/xlint/lint1/msg_210.c:1.3 src/tests/usr.bin/xlint/lint1/msg_210.c:1.4 --- src/tests/usr.bin/xlint/lint1/msg_210.c:1.3 Sun Feb 21 10:12:29 2021 +++ src/tests/usr.bin/xlint/lint1/msg_210.c Mon Feb 22 15:09:50 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: msg_210.c,v 1.3 2021/02/21 10:12:29 rillig Exp $ */ +/* $NetBSD: msg_210.c,v 1.4 2021/02/22 15:09:50 rillig Exp $ */ # 3 "msg_210.c" -// Test for message: enum type mismatch in initialisation [210] +// Test for message: enum type mismatch in initialization [210] enum A { A1 Index: src/tests/usr.bin/xlint/lint1/msg_210.exp diff -u src/tests/usr.bin/xlint/lint1/msg_210.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_210.exp:1.4 --- src/tests/usr.bin/xlint/lint1/msg_210.exp:1.3 Sun Feb 21 10:28:33 2021 +++ src/tests/usr.bin/xlint/lint1/msg_210.exp Mon Feb 22 15:09:50 2021 @@ -1,2 +1,2 @@ -msg_210.c(23): warning: enum type mismatch between 'enum A' and 'enum B' in initialisation [210] -msg_210.c(25): warning: enum type mismatch between 'C' and 'D' in initialisation [210] +msg_210.c(23): warning: enum type mismatch between 'enum A' and 'enum B' in initialization [210] +msg_210.c(25): warning: enum type mismatch between 'C' and 'D' in initialization [210] Index: src/tests/usr.bin/xlint/lint1/msg_221.c diff -u src/tests/usr.bin/xlint/lint1/msg_221.c:1.3 src/tests/usr.bin/xlint/lint1/msg_221.c:1.4 --- src/tests/usr.bin/xlint/lint1/msg_221.c:1.3 Sun Jan 31 11:12:07 2021 +++ src/tests/usr.bin/xlint/lint1/msg_221.c Mon Feb 22 15:09:50 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: msg_221.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */ +/* $NetBSD: msg_221.c,v 1.4 2021/02/22 15:09:50 rillig Exp $ */ # 3 "msg_221.c" -// Test for message: initialisation of unsigned with negative constant [221] +// Test for message: initialization of unsigned with negative constant [221] struct example { unsigned int a: 5; Index: src/usr.bin/xlint/lint1/decl.c diff -u src/usr.bin/xlint/lint1/decl.c:1.137 src/usr.bin/xlint/lint1/decl.c:1.138 --- src/usr.bin/xlint/lint1/decl.c:1.137 Fri Feb 19 22:35:42 2021 +++ src/usr.bin/xlint/lint1/decl.c Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: decl.c,v 1.137 2021/02/19 22:35:42 rillig Exp $ */ +/* $NetBSD: decl.c,v 1.138 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: decl.c,v 1.137 2021/02/19 22:35:42 rillig Exp $"); +__RCSID("$NetBSD: decl.c,v 1.138 2021/02/22 15:09:50 rillig Exp $"); #endif #include <sys/param.h> @@ -2851,7 +2851,7 @@ declare_1_abstract(sym_t *sym) } /* - * Checks size after declarations of variables and their initialisation. + * Checks size after declarations of variables and their initialization. */ void check_size(sym_t *dsym) Index: src/usr.bin/xlint/lint1/err.c diff -u src/usr.bin/xlint/lint1/err.c:1.80 src/usr.bin/xlint/lint1/err.c:1.81 --- src/usr.bin/xlint/lint1/err.c:1.80 Sun Feb 21 10:28:33 2021 +++ src/usr.bin/xlint/lint1/err.c Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: err.c,v 1.80 2021/02/21 10:28:33 rillig Exp $ */ +/* $NetBSD: err.c,v 1.81 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -37,7 +37,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: err.c,v 1.80 2021/02/21 10:28:33 rillig Exp $"); +__RCSID("$NetBSD: err.c,v 1.81 2021/02/22 15:09:50 rillig Exp $"); #endif #include <sys/types.h> @@ -234,7 +234,7 @@ const char *msgs[] = { "too many struct/union initializers", /* 172 */ "too many array initializers, expected %d", /* 173 */ "too many initializers", /* 174 */ - "initialisation of an incomplete type", /* 175 */ + "initialization of an incomplete type", /* 175 */ "invalid initializer type %s", /* 176 */ "non-constant initializer", /* 177 */ "initializer does not fit", /* 178 */ @@ -244,8 +244,8 @@ const char *msgs[] = { "incompatible pointer types (%s != %s)", /* 182 */ "illegal combination of %s (%s) and %s (%s)", /* 183 */ "illegal pointer combination", /* 184 */ - "initialisation type mismatch (%s) and (%s)", /* 185 */ - "bit-field initialisation is illegal in traditional C", /* 186 */ + "initialization type mismatch (%s) and (%s)", /* 185 */ + "bit-field initialization is illegal in traditional C", /* 186 */ "non-null byte ignored in string initializer", /* 187 */ "no automatic aggregate initialization in traditional C", /* 188 */ "", /* no longer used */ /* 189 */ @@ -269,7 +269,7 @@ const char *msgs[] = { "loop not entered at top", /* 207 */ "break outside loop or switch", /* 208 */ "continue outside loop", /* 209 */ - "enum type mismatch between '%s' and '%s' in initialisation", /* 210 */ + "enum type mismatch between '%s' and '%s' in initialization", /* 210 */ "return value type mismatch (%s) and (%s)", /* 211 */ "cannot return incomplete type", /* 212 */ "void function %s cannot return value", /* 213 */ @@ -280,7 +280,7 @@ const char *msgs[] = { "ANSI C treats constant as unsigned, op %s", /* 218 */ "concatenated strings are illegal in traditional C", /* 219 */ "fallthrough on case statement", /* 220 */ - "initialisation of unsigned with negative constant", /* 221 */ + "initialization of unsigned with negative constant", /* 221 */ "conversion of negative constant to unsigned type", /* 222 */ "end-of-loop code not reached", /* 223 */ "cannot recover from previous errors", /* 224 */ @@ -297,7 +297,7 @@ const char *msgs[] = { "enum %s never defined", /* 235 */ "static function %s unused", /* 236 */ "redeclaration of formal parameter %s", /* 237 */ - "initialisation of union is illegal in traditional C", /* 238 */ + "initialization of union is illegal in traditional C", /* 238 */ "constant argument to NOT", /* 239 */ "assignment of different structures (%s != %s)", /* 240 */ "dubious operation on enum, op %s", /* 241 */ @@ -336,7 +336,7 @@ const char *msgs[] = { "ANSI C forbids comparison of %s with %s", /* 274 */ "cast discards 'const' from type '%s'", /* 275 */ "__%s__ is illegal for type %s", /* 276 */ - "initialisation of '%s' with '%s'", /* 277 */ + "initialization of '%s' with '%s'", /* 277 */ "combination of '%s' and '%s', arg #%d", /* 278 */ "combination of '%s' and '%s' in return", /* 279 */ "must be outside function: /* %s */", /* 280 */ Index: src/usr.bin/xlint/lint1/func.c diff -u src/usr.bin/xlint/lint1/func.c:1.72 src/usr.bin/xlint/lint1/func.c:1.73 --- src/usr.bin/xlint/lint1/func.c:1.72 Sun Feb 21 09:17:55 2021 +++ src/usr.bin/xlint/lint1/func.c Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: func.c,v 1.72 2021/02/21 09:17:55 rillig Exp $ */ +/* $NetBSD: func.c,v 1.73 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -37,7 +37,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: func.c,v 1.72 2021/02/21 09:17:55 rillig Exp $"); +__RCSID("$NetBSD: func.c,v 1.73 2021/02/22 15:09:50 rillig Exp $"); #endif #include <stdlib.h> @@ -827,7 +827,7 @@ for1(tnode_t *tn1, tnode_t *tn2, tnode_t { /* - * If there is no initialisation expression it is possible that + * If there is no initialization expression it is possible that * it is intended not to enter the loop at top. */ if (tn1 != NULL && !reached) { @@ -840,7 +840,7 @@ for1(tnode_t *tn1, tnode_t *tn2, tnode_t cstmt->c_loop = true; /* - * Store the tree memory for the reinitialisation expression. + * Store the tree memory for the reinitialization expression. * Also remember this expression itself. We must check it at * the end of the loop to get "used but not set" warnings correct. */ @@ -860,7 +860,7 @@ for1(tnode_t *tn1, tnode_t *tn2, tnode_t cstmt->c_infinite = tn2 == NULL || (tn2->tn_op == CON && is_nonzero(tn2)); - /* Checking the reinitialisation expression is done in for2() */ + /* Checking the reinitialization expression is done in for2() */ reached = true; } @@ -881,7 +881,7 @@ for2(void) cpos = curr_pos; cspos = csrc_pos; - /* Restore the tree memory for the reinitialisation expression */ + /* Restore the tree memory for the reinitialization expression */ trestor(cstmt->c_fexprm); tn3 = cstmt->c_f3expr; curr_pos = cstmt->c_fpos; Index: src/usr.bin/xlint/lint1/init.c diff -u src/usr.bin/xlint/lint1/init.c:1.88 src/usr.bin/xlint/lint1/init.c:1.89 --- src/usr.bin/xlint/lint1/init.c:1.88 Mon Feb 22 15:01:03 2021 +++ src/usr.bin/xlint/lint1/init.c Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.88 2021/02/22 15:01:03 rillig Exp $ */ +/* $NetBSD: init.c,v 1.89 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -37,7 +37,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: init.c,v 1.88 2021/02/22 15:01:03 rillig Exp $"); +__RCSID("$NetBSD: init.c,v 1.89 2021/02/22 15:09:50 rillig Exp $"); #endif #include <stdlib.h> @@ -47,7 +47,7 @@ __RCSID("$NetBSD: init.c,v 1.88 2021/02/ /* - * Type of stack which is used for initialisation of aggregate types. + * Type of stack which is used for initialization of aggregate types. * * XXX: Since C99, a stack is an inappropriate data structure for modelling * an initialization, since the designators don't have to be listed in a @@ -65,7 +65,7 @@ __RCSID("$NetBSD: init.c,v 1.88 2021/02/ typedef struct initstack_element { /* XXX: Why is i_type often null? */ - type_t *i_type; /* type of initialisation */ + type_t *i_type; /* type of initialization */ type_t *i_subt; /* type of next level */ /* @@ -127,16 +127,16 @@ typedef struct namlist { /* - * initerr is set as soon as a fatal error occurred in an initialisation. - * The effect is that the rest of the initialisation is ignored (parsed - * by yacc, expression trees built, but no initialisation takes place). + * initerr is set as soon as a fatal error occurred in an initialization. + * The effect is that the rest of the initialization is ignored (parsed + * by yacc, expression trees built, but no initialization takes place). */ bool initerr; /* Pointer to the symbol which is to be initialized. */ sym_t *initsym; -/* Points to the top element of the initialisation stack. */ +/* Points to the top element of the initialization stack. */ initstack_element *initstk; /* Points to a c9x named member; */ @@ -307,7 +307,7 @@ debug_initstack(void) #endif /* - * Initialize the initialisation stack by putting an entry for the object + * Initialize the initialization stack by putting an entry for the object * which is to be initialized on it. */ void @@ -318,7 +318,7 @@ initstack_init(void) if (initerr) return; - /* free memory used in last initialisation */ + /* free memory used in last initialization */ while ((istk = initstk) != NULL) { initstk = istk->i_enclosing; free(istk); @@ -507,7 +507,7 @@ again: if (is_incomplete(istk->i_type) && istk->i_enclosing->i_enclosing != NULL) { - /* initialisation of an incomplete type */ + /* initialization of an incomplete type */ error(175); initerr = true; debug_initstack(); @@ -523,12 +523,12 @@ again: break; case UNION: if (tflag) - /* initialisation of union is illegal in trad. C */ + /* initialization of union is illegal in trad. C */ warning(238); /* FALLTHROUGH */ case STRUCT: if (is_incomplete(istk->i_type)) { - /* initialisation of an incomplete type */ + /* initialization of an incomplete type */ error(175); initerr = true; debug_initstack(); @@ -737,7 +737,7 @@ check_bit_field_init(const tnode_t *ln, is_integer(lt) && ln->tn_type->t_bitfield && !is_integer(rt)) { - /* bit-field initialisation is illegal in traditional C */ + /* bit-field initialization is illegal in traditional C */ warning(186); } } @@ -783,14 +783,14 @@ init_using_expr(tnode_t *tn) sclass = initsym->s_scl; /* - * Do not test for automatic aggregate initialisation. If the + * Do not test for automatic aggregate initialization. If the * initializer starts with a brace we have the warning already. * If not, an error will be printed that the initializer must * be enclosed by braces. */ /* - * Local initialisation of non-array-types with only one expression + * Local initialization of non-array-types with only one expression * without braces is done by ASSIGN */ if ((sclass == AUTO || sclass == REG) && Index: src/usr.bin/xlint/lint1/lex.c diff -u src/usr.bin/xlint/lint1/lex.c:1.8 src/usr.bin/xlint/lint1/lex.c:1.9 --- src/usr.bin/xlint/lint1/lex.c:1.8 Sat Feb 20 11:06:56 2021 +++ src/usr.bin/xlint/lint1/lex.c Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: lex.c,v 1.8 2021/02/20 11:06:56 rillig Exp $ */ +/* $NetBSD: lex.c,v 1.9 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: lex.c,v 1.8 2021/02/20 11:06:56 rillig Exp $"); +__RCSID("$NetBSD: lex.c,v 1.9 2021/02/22 15:09:50 rillig Exp $"); #endif #include <ctype.h> @@ -101,7 +101,7 @@ lex_unknown_character(int c) /* * Keywords. - * During initialisation they are written to the symbol table. + * During initialization they are written to the symbol table. */ static struct kwtab { const char *kw_name; /* keyword */ Index: src/usr.bin/xlint/lint1/lint1.h diff -u src/usr.bin/xlint/lint1/lint1.h:1.65 src/usr.bin/xlint/lint1/lint1.h:1.66 --- src/usr.bin/xlint/lint1/lint1.h:1.65 Fri Feb 19 22:35:42 2021 +++ src/usr.bin/xlint/lint1/lint1.h Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: lint1.h,v 1.65 2021/02/19 22:35:42 rillig Exp $ */ +/* $NetBSD: lint1.h,v 1.66 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -223,7 +223,7 @@ typedef struct sym { prototype declaration, no-prototype-def., tentative definition or declaration, in this order */ - pos_t s_set_pos; /* position of first initialisation */ + pos_t s_set_pos; /* position of first initialization */ pos_t s_use_pos; /* position of first use */ symt_t s_kind; /* type of symbol */ void *s_keyword; Index: src/usr.bin/xlint/lint1/tree.c diff -u src/usr.bin/xlint/lint1/tree.c:1.217 src/usr.bin/xlint/lint1/tree.c:1.218 --- src/usr.bin/xlint/lint1/tree.c:1.217 Mon Feb 22 15:01:03 2021 +++ src/usr.bin/xlint/lint1/tree.c Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tree.c,v 1.217 2021/02/22 15:01:03 rillig Exp $ */ +/* $NetBSD: tree.c,v 1.218 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -37,7 +37,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: tree.c,v 1.217 2021/02/22 15:01:03 rillig Exp $"); +__RCSID("$NetBSD: tree.c,v 1.218 2021/02/22 15:09:50 rillig Exp $"); #endif #include <float.h> @@ -1654,7 +1654,7 @@ check_assign_types_compatible(op_t op, i switch (op) { case INIT: - /* initialisation type mismatch (%s) and (%s) */ + /* initialization type mismatch (%s) and (%s) */ error(185, type_name(ltp), type_name(rtp)); break; case RETURN: @@ -1762,7 +1762,7 @@ check_enum_int_mismatch(op_t op, int arg rn->tn_val->v_quad == 0) { return; } - /* initialisation of '%s' with '%s' */ + /* initialization of '%s' with '%s' */ warning(277, type_name(ln->tn_type), type_name(rn->tn_type)); break; case FARG: @@ -2434,7 +2434,7 @@ convert_constant(op_t op, int arg, type_ /* assignment of negative constant to ... */ warning(164); } else if (op == INIT) { - /* initialisation of unsigned with neg... */ + /* initialization of unsigned with neg... */ warning(221); } else if (op == FARG) { /* conversion of negative constant to ... */ @@ -3746,7 +3746,7 @@ expr(tnode_t *tn, bool vctx, bool tctx, return; } - /* expr() is also called in global initialisations */ + /* expr() is also called in global initializations */ if (dcs->d_ctx != EXTERN) check_statement_reachable(); @@ -4173,9 +4173,9 @@ check_integer_comparison(op_t op, tnode_ } /* - * Return whether the expression can be used for static initialisation. + * Return whether the expression can be used for static initialization. * - * Constant initialisation expressions must be constant or an address + * Constant initialization expressions must be constant or an address * of a static object with an optional offset. In the first case, * the result is returned in *offsp. In the second case, the static * object is returned in *symp and the offset in *offsp. Index: src/usr.bin/xlint/lint2/chk.c diff -u src/usr.bin/xlint/lint2/chk.c:1.38 src/usr.bin/xlint/lint2/chk.c:1.39 --- src/usr.bin/xlint/lint2/chk.c:1.38 Fri Feb 19 22:27:49 2021 +++ src/usr.bin/xlint/lint2/chk.c Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: chk.c,v 1.38 2021/02/19 22:27:49 rillig Exp $ */ +/* $NetBSD: chk.c,v 1.39 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: chk.c,v 1.38 2021/02/19 22:27:49 rillig Exp $"); +__RCSID("$NetBSD: chk.c,v 1.39 2021/02/22 15:09:50 rillig Exp $"); #endif #include <ctype.h> @@ -269,7 +269,7 @@ chkvtui(hte_t *hte, sym_t *def, sym_t *d * XXX Following massage may be confusing * because it appears also if the return value * was declared inconsistently. But this - * behaviour matches pcc based lint, so it is + * behavior matches pcc based lint, so it is * accepted for now. */ pos1 = xstrdup(mkpos(&def->s_pos)); Index: src/usr.bin/xlint/lint2/emit2.c diff -u src/usr.bin/xlint/lint2/emit2.c:1.16 src/usr.bin/xlint/lint2/emit2.c:1.17 --- src/usr.bin/xlint/lint2/emit2.c:1.16 Fri Feb 19 22:27:49 2021 +++ src/usr.bin/xlint/lint2/emit2.c Mon Feb 22 15:09:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: emit2.c,v 1.16 2021/02/19 22:27:49 rillig Exp $ */ +/* $NetBSD: emit2.c,v 1.17 2021/02/22 15:09:50 rillig Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -34,7 +34,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: emit2.c,v 1.16 2021/02/19 22:27:49 rillig Exp $"); +__RCSID("$NetBSD: emit2.c,v 1.17 2021/02/22 15:09:50 rillig Exp $"); #endif #include "lint2.h" @@ -223,7 +223,7 @@ dumpname(hte_t *hte) void outlib(const char *name) { - /* Open of output file and initialisation of the output buffer */ + /* Open of output file and initialization of the output buffer */ outopen(name); /* write name of lint library */