diff options
| author | Ulrich Spörlein <uqs@FreeBSD.org> | 2011-12-30 11:02:40 +0000 |
|---|---|---|
| committer | Ulrich Spörlein <uqs@FreeBSD.org> | 2011-12-30 11:02:40 +0000 |
| commit | 487ac9ac212077c859aafc40ac9660a84d0f294e (patch) | |
| tree | d145ece02284bd86561f373fcb369e260154153b | |
| parent | fb2ad9d3a495c2ad70c72b3321b61f43d132fbfa (diff) | |
| download | src-487ac9ac212077c859aafc40ac9660a84d0f294e.tar.gz src-487ac9ac212077c859aafc40ac9660a84d0f294e.zip | |
Notes
49 files changed, 94 insertions, 90 deletions
diff --git a/usr.bin/csup/fixups.c b/usr.bin/csup/fixups.c index a83ad1c456e7..a1df1159d41a 100644 --- a/usr.bin/csup/fixups.c +++ b/usr.bin/csup/fixups.c @@ -38,7 +38,7 @@ /* * A synchronized queue to implement fixups. The updater thread adds * fixup requests to the queue with fixups_put() when a checksum - * mismatch error occured. It then calls fixups_close() when he's + * mismatch error occurred. It then calls fixups_close() when he's * done requesting fixups. The detailer thread gets the fixups with * fixups_get() and then send the requests to the server. * diff --git a/usr.bin/csup/mux.c b/usr.bin/csup/mux.c index b344be126c30..9335fa988897 100644 --- a/usr.bin/csup/mux.c +++ b/usr.bin/csup/mux.c @@ -680,7 +680,7 @@ mux_init(struct mux *m) /* * Close all the channels, terminate the sender and receiver thread. - * This is an important function because it is used everytime we need + * This is an important function because it is used every time we need * to wake up all the worker threads to abort the program. * * This function accepts an error message that will be printed if the diff --git a/usr.bin/csup/rcsfile.c b/usr.bin/csup/rcsfile.c index 33caa03e7cf0..dcc200283568 100644 --- a/usr.bin/csup/rcsfile.c +++ b/usr.bin/csup/rcsfile.c @@ -1254,8 +1254,8 @@ rcsfile_insertsorteddelta(struct rcsfile *rf, struct delta *d) /* * Insert a delta into the correct place in branch. A trunk branch will have * different ordering scheme and be sorted by revision number, but a normal - * branch will be sorted by date to maintain compability with branches that is - * "hand-hacked". + * branch will be sorted by date to maintain compatibility with branches that + * is "hand-hacked". */ static void rcsfile_insertdelta(struct branch *b, struct delta *d, int trunk) diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index 6586f0a1f965..2704a96bbc26 100644 --- a/usr.bin/finger/finger.c +++ b/usr.bin/finger/finger.c @@ -299,8 +299,8 @@ userlist(int argc, char **argv) goto net; /* - * Mark any arguments beginning with '/' as invalid so that we - * don't accidently confuse them with expansions from finger.conf + * Mark any arguments beginning with '/' as invalid so that we + * don't accidentally confuse them with expansions from finger.conf */ for (p = argv, ip = used; *p; ++p, ++ip) if (**p == '/') { diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index 159ceb9ae6db..6014dddc47c2 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -150,7 +150,7 @@ do_fstat(int argc, char **argv) if (getfname(*argv)) checkfile = 1; } - if (!checkfile) /* file(s) specified, but none accessable */ + if (!checkfile) /* file(s) specified, but none accessible */ exit(1); } diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c index 161a758a6001..3035faa62a54 100644 --- a/usr.bin/indent/indent.c +++ b/usr.bin/indent/indent.c @@ -326,7 +326,7 @@ main(int argc, char **argv) case lbrace: /* this is a brace that starts the compound * stmt */ - if (sc_end == 0) { /* ignore buffering if a comment wasnt + if (sc_end == 0) { /* ignore buffering if a comment wasn't * stored up */ ps.search_brace = false; goto check_type; @@ -384,7 +384,7 @@ main(int argc, char **argv) && e_code != s_code && e_code[-1] == '}')) force_nl = false; - if (sc_end == 0) { /* ignore buffering if comment wasnt + if (sc_end == 0) { /* ignore buffering if comment wasn't * saved up */ ps.search_brace = false; goto check_type; @@ -794,8 +794,8 @@ check_type: /* ? dec_ind = 0; */ } else { - ps.decl_on_line = false; /* we cant be in the middle of - * a declaration, so dont do + ps.decl_on_line = false; /* we can't be in the middle of + * a declaration, so don't do * special indentation of * comments */ if (blanklines_after_declarations_at_proctop diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c index dda626512707..4a3db83d1100 100644 --- a/usr.bin/indent/io.c +++ b/usr.bin/indent/io.c @@ -232,7 +232,7 @@ dump_line(void) target = ((target - 1) & ~7) + 9, com_st++; else target = 1; - if (cur_col > target) { /* if comment cant fit on this line, + if (cur_col > target) { /* if comment can't fit on this line, * put it on next line */ putc('\n', output); cur_col = 1; diff --git a/usr.bin/ipcs/ipc.c b/usr.bin/ipcs/ipc.c index e0601dce4085..4c6274304f4f 100644 --- a/usr.bin/ipcs/ipc.c +++ b/usr.bin/ipcs/ipc.c @@ -24,7 +24,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * The split of ipcs.c into ipcs.c and ipc.c to accomodate the + * The split of ipcs.c into ipcs.c and ipc.c to accommodate the * changes in ipcrm.c was done by Edwin Groothuis <edwin@FreeBSD.org> */ diff --git a/usr.bin/ipcs/ipc.h b/usr.bin/ipcs/ipc.h index a7a70de4ceb8..640c3fd7ce27 100644 --- a/usr.bin/ipcs/ipc.h +++ b/usr.bin/ipcs/ipc.h @@ -24,7 +24,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * The split of ipcs.c into ipcs.c and ipc.c to accomodate the + * The split of ipcs.c into ipcs.c and ipc.c to accommodate the * changes in ipcrm.c was done by Edwin Groothuis <edwin@FreeBSD.org> * * $FreeBSD$ diff --git a/usr.bin/lex/NEWS b/usr.bin/lex/NEWS index 3e23e7d9f623..e6328851d5a8 100644 --- a/usr.bin/lex/NEWS +++ b/usr.bin/lex/NEWS @@ -1,3 +1,5 @@ +$FreeBSD$ + Changes between release 2.5.4 (11Sep96) and release 2.5.3: - Fixed a bug introduced in 2.5.3 that blew it when a call @@ -944,7 +946,7 @@ Changes between 2.3 (full) release of 28Jun90 and 2.2 (alpha) release: given. To specify an end-of-file action for just the initial state, use <INITIAL><<EOF>>. - - -d debug output is now contigent on the global yy_flex_debug + - -d debug output is now contingent on the global yy_flex_debug being set to a non-zero value, which it is by default. - A new macro, YY_USER_INIT, is provided for the user to specify @@ -987,7 +989,7 @@ Changes between 2.3 (full) release of 28Jun90 and 2.2 (alpha) release: - yy_switch_to_buffer() can be used in the yywrap() macro/routine. - flex scanners do not use stdio for their input, and hence when - writing an interactive scanner one must explictly call fflush() + writing an interactive scanner one must explicitly call fflush() after writing out a prompt. - flex scanner can be made reentrant (after a fashion) by using diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h index ddc876876093..1c51ec90f058 100644 --- a/usr.bin/lex/flexdef.h +++ b/usr.bin/lex/flexdef.h @@ -869,7 +869,7 @@ extern void mark_defs1 PROTO((void)); /* Mark the current position in the action array as the end of the prolog. */ extern void mark_prolog PROTO((void)); -/* Generate a data statment for a two-dimensional array. */ +/* Generate a data statement for a two-dimensional array. */ extern void mk2data PROTO((int)); extern void mkdata PROTO((int)); /* generate a data statement */ diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c index 12af3dc64fd7..d5d623dc89ef 100644 --- a/usr.bin/lex/tblcmp.c +++ b/usr.bin/lex/tblcmp.c @@ -510,7 +510,7 @@ void mkdeftbl() * (i.e., jam entries) into the table. It is assumed that by linking to * "JAMSTATE" they will be taken care of. In any case, entries in "state" * marking transitions to "SAME_TRANS" are treated as though they will be - * taken care of by whereever "deflink" points. "totaltrans" is the total + * taken care of by wherever "deflink" points. "totaltrans" is the total * number of transitions out of the state. If it is below a certain threshold, * the tables are searched for an interior spot that will accommodate the * state array. diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c index 2da69a23c64f..cf41fa4ca85e 100644 --- a/usr.bin/limits/limits.c +++ b/usr.bin/limits/limits.c @@ -236,7 +236,7 @@ static struct { /* * One letter for each resource levels. - * NOTE: There is a dependancy on the corresponding + * NOTE: There is a dependency on the corresponding * letter index being equal to the resource number. * If sys/resource.h defines are changed, this needs * to be modified accordingly! diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c index 67a97da78202..b0faefbf63f5 100644 --- a/usr.bin/locate/locate/locate.c +++ b/usr.bin/locate/locate/locate.c @@ -188,7 +188,7 @@ main(argc, argv) /* no (valid) database as argument */ if (dbv == NULL || *dbv == NULL) { - /* try to read database from enviroment */ + /* try to read database from environment */ if ((path_fcodes = getenv("LOCATE_PATH")) == NULL || *path_fcodes == '\0') /* use default database */ diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c index 9cd02b00d716..7b9fe49d52f1 100644 --- a/usr.bin/locate/locate/util.c +++ b/usr.bin/locate/locate/util.c @@ -218,11 +218,11 @@ tolower_word(word) /* - * Read integer from mmap pointer. - * Essential a simple ``return *(int *)p'' but avoid sigbus + * Read integer from mmap pointer. + * Essential a simple ``return *(int *)p'' but avoid sigbus * for integer alignment (SunOS 4.x, 5.x). * - * Convert network byte order to host byte order if neccessary. + * Convert network byte order to host byte order if necessary. * So we can read on FreeBSD/i386 (little endian) a locate database * which was built on SunOS/sparc (big endian). */ @@ -254,7 +254,7 @@ getwm(p) /* * Read integer from stream. * - * Convert network byte order to host byte order if neccessary. + * Convert network byte order to host byte order if necessary. * So we can read on FreeBSD/i386 (little endian) a locate database * which was built on SunOS/sparc (big endian). */ diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c index afa320f83991..ad64e4fad948 100644 --- a/usr.bin/login/login_fbtab.c +++ b/usr.bin/login/login_fbtab.c @@ -25,7 +25,7 @@ SunOS 4.1.x fbtab(5) and SunOS 5.x logindevperm(4) manual pages. The program first looks for /etc/fbtab. If that file cannot be opened it attempts to process /etc/logindevperm. - We expect entries with the folowing format: + We expect entries with the following format: Comments start with a # and extend to the end of the line. diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c index 29b1426b7c80..d836ce4882de 100644 --- a/usr.bin/mail/head.c +++ b/usr.bin/mail/head.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); /* * See if the passed line buffer is a mail header. * Return true if yes. Note the extreme pains to - * accomodate all funny formats. + * accommodate all funny formats. */ int ishead(char linebuf[]) diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c index 0c4e2cba55e5..cfc3f88c91a0 100644 --- a/usr.bin/mail/main.c +++ b/usr.bin/mail/main.c @@ -259,7 +259,7 @@ Usage: %s [-dEiInv] [-s subject] [-c cc-addr] [-b bcc-addr] [-F] to-addr ...\n\ if (ef == NULL) ef = "%"; if (setfile(ef) <= 0) - /* Either an error has occured, or no mail */ + /* Either an error has occurted, or no mail */ exit(1); else exit(0); diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c index 461738df2001..e72c564e9f41 100644 --- a/usr.bin/mail/util.c +++ b/usr.bin/mail/util.c @@ -550,7 +550,7 @@ newname: } /* - * Count the occurances of c in str + * Count the occurrances of c in str */ int charcount(char *str, int c) diff --git a/usr.bin/make/GNode.h b/usr.bin/make/GNode.h index 71d2afd93418..05af1d0b597d 100644 --- a/usr.bin/make/GNode.h +++ b/usr.bin/make/GNode.h @@ -139,7 +139,7 @@ typedef struct GNode { UPTODATE, /* Was already up-to-date */ /* - * An error occured while it was being + * An error occurred while it was being * made (used only in compat mode) */ ERROR, diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index 9cd0a1c64618..e4f6b0dd1bf1 100644 --- a/usr.bin/make/arch.c +++ b/usr.bin/make/arch.c @@ -179,8 +179,8 @@ Boolean arch_fatal = TRUE; /** * ArchError - * An error happend while handling an archive. BSDmake traditionally - * ignored these errors. Now this is dependend on the global arch_fatal + * An error happened while handling an archive. BSDmake traditionally + * ignored these errors. Now this is dependent on the global arch_fatal * which, if true, makes these errors fatal and, if false, just emits an * error message. */ @@ -529,7 +529,7 @@ ArchArchiveOpen(const char *archive, const char *mode) /* * Read the next header from the archive. The return value will be +1 if - * the header is read successfully, 0 on EOF and -1 if an error happend. + * the header is read successfully, 0 on EOF and -1 if an error happened. * On a successful return sname contains the truncated member name and * member the full name. hdr contains the member header. For the symbol table * names of length 0 are returned. The entry for the file name table is never @@ -830,7 +830,7 @@ ArchFindMember(const char *archive, const char *member, const char *mode) * (3) the name is longer and the archive doesn't support long * names. * Because we don't know whether the archive supports long - * names or not we need to be carefull. + * names or not we need to be careful. */ if (member == NULL) { /* special case - symbol table */ @@ -942,7 +942,7 @@ ArchStatMember(const char *archive, const char *member, Boolean hash) ArchArchiveClose(arf); if (t < 0) { - /* error happend - throw away everything */ + /* error happened - throw away everything */ Hash_DeleteTable(&ar->members); free(ar->name); free(ar); diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c index 7c6c01f4eb2a..fa866d31ef40 100644 --- a/usr.bin/make/buf.c +++ b/usr.bin/make/buf.c @@ -206,7 +206,7 @@ Buf_Destroy(Buffer *buf, Boolean freeData) /** * Replace the last byte in a buffer. If the buffer was empty - * intially, then a new byte will be added. + * initially, then a new byte will be added. */ void Buf_ReplaceLastByte(Buffer *bp, Byte byte) diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c index f2eccce9afd1..1b2e578a0830 100644 --- a/usr.bin/make/for.c +++ b/usr.bin/make/for.c @@ -218,7 +218,7 @@ For_Eval(char *line) /*- *----------------------------------------------------------------------- * For_Run -- - * Run the for loop, immitating the actions of an include file + * Run the for loop, imitating the actions of an include file * * Results: * None. diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 75f794925858..2798181d8527 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -1897,7 +1897,7 @@ JobOutput(Job *job, char *cp, char *endp, int msg) * this makes up a line, we print it tagged by the job's identifier, * as necessary. * If output has been collected in a temporary file, we open the - * file and read it line by line, transfering it to our own + * file and read it line by line, transferring it to our own * output channel until the file is empty. At which point we * remove the temporary file. * In both cases, however, we keep our figurative eye out for the diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index daeada404081..fe5ae589b499 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -267,13 +267,13 @@ ReadMakefile(const char p[]) * XXX The realpath stuff breaks relative includes * XXX in some cases. The problem likely is in * XXX parse.c where it does special things in - * XXX ParseDoInclude if the file is relateive + * XXX ParseDoInclude if the file is relative * XXX or absolute and not a system file. There * XXX it assumes that if the current file that's * XXX being included is absolute, that any files * XXX that it includes shouldn't do the -I path - * XXX stuff, which is inconsistant with historical - * XXX behavior. However, I can't pentrate the mists + * XXX stuff, which is inconsistent with historical + * XXX behavior. However, I can't penetrate the mists * XXX further, so I'm putting this workaround in * XXX here until such time as the underlying bug * XXX can be fixed. @@ -675,7 +675,7 @@ chdir_verify_path(const char *path, char *obpath) * prevent a forkbomb from happening, in a dumb and mechanical way. * * Side Effects: - * Creates or modifies enviornment variable MKLVL_ENVVAR via setenv(). + * Creates or modifies environment variable MKLVL_ENVVAR via setenv(). */ static void check_make_level(void) @@ -954,7 +954,7 @@ main(int argc, char **argv) } /* - * Set machine_cpu to the minumum supported CPU revision based + * Set machine_cpu to the minimum supported CPU revision based * on the target architecture, if not already set. */ if ((machine_cpu = getenv("MACHINE_CPU")) == NULL) { @@ -1047,7 +1047,7 @@ main(int argc, char **argv) * * Once things are initted, * have to add the original directory to the search path, - * and modify the paths for the Makefiles apropriately. The + * and modify the paths for the Makefiles appropriately. The * current directory is also placed as a variable for make scripts. */ if (!(pathp = getenv("MAKEOBJDIRPREFIX"))) { diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c index 286eac5d7ee6..ce4ac05f6eb4 100644 --- a/usr.bin/make/str.c +++ b/usr.bin/make/str.c @@ -50,10 +50,10 @@ __FBSDID("$FreeBSD$"); /** * Initialize the argument array object. The array is initially - * eight positions, and will be expaned as neccessary. The first + * eight positions, and will be expanded as necessary. The first * position is set to NULL since everything ignores it. We allocate * (size + 1) since we need space for the terminating NULL. The - * buffer is set to NULL, since no common buffer is alloated yet. + * buffer is set to NULL, since no common buffer is allocated yet. */ void ArgArray_Init(ArgArray *aa) diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 534abcaf42b0..a7babaf259e2 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -842,7 +842,7 @@ VarLocal(const char name[]) } /** - * Find the given variable in the given context and the enviornment. + * Find the given variable in the given context and the environment. * * Results: * A pointer to the structure describing the desired variable or diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 98749a60a192..0725e0bff66a 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -369,7 +369,7 @@ man_display_page() { while getopts 'egprtv' preproc_arg; do case "${preproc_arg}" in e) pipeline="$pipeline | $EQN" ;; - g) ;; # Ignore for compatability. + g) ;; # Ignore for compatibility. p) pipeline="$pipeline | $PIC" ;; r) pipeline="$pipeline | $REFER" ;; t) pipeline="$pipeline | $TBL" ;; diff --git a/usr.bin/ncplogin/ncplogin.c b/usr.bin/ncplogin/ncplogin.c index edb903e70a01..e64f63adbd51 100644 --- a/usr.bin/ncplogin/ncplogin.c +++ b/usr.bin/ncplogin/ncplogin.c @@ -188,8 +188,8 @@ main(int argc, char *argv[]) { error = 0; } while(0); if (error) - errx(EX_DATAERR, - "an error occured while parsing '%s'", + errx(EX_DATAERR, + "an error occurred while parsing '%s'", argv[argc - 1]); } diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c index b79a93bba984..aa3dd40dd800 100644 --- a/usr.bin/netstat/ipx.c +++ b/usr.bin/netstat/ipx.c @@ -201,7 +201,7 @@ spx_stats(u_long off, const char *name, int af1 __unused, int proto __unused) ANYl(spxstat.spxs_sndurg, "packet", " sent with URG only"); ANYl(spxstat.spxs_sndwinup, "window update-only packet", " sent"); ANYl(spxstat.spxs_sndctrl, "control (SYN|FIN|RST) packet", " sent"); - ANYl(spxstat.spxs_sndvoid, "request", " to send a non-existant packet"); + ANYl(spxstat.spxs_sndvoid, "request", " to send a non-existent packet"); ANYl(spxstat.spxs_rcvtotal, "total packet", " received"); ANYl(spxstat.spxs_rcvpack, "packet", " received in sequence"); ANYl(spxstat.spxs_rcvbyte, "byte", " received in sequence"); diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c index 510f9e86b04b..947d768dffbf 100644 --- a/usr.bin/pr/pr.c +++ b/usr.bin/pr/pr.c @@ -822,7 +822,7 @@ mulfile(int argc, char *argv[]) * do not know how many columns yet. The number of operands provide an * upper bound on the number of columns. We use the number of files * we can open successfully to set the number of columns. The operation - * of the merge operation (-m) in relation to unsuccesful file opens + * of the merge operation (-m) in relation to unsuccessful file opens * is unspecified by posix. */ j = 0; @@ -841,7 +841,7 @@ mulfile(int argc, char *argv[]) return(1); /* - * calculate page boundries based on open file count + * calculate page boundaries based on open file count */ clcnt = j; if (nmwd) { @@ -987,7 +987,7 @@ mulfile(int argc, char *argv[]) * inf: file * buf: buffer * lim: buffer length - * cps: column positon 1st char in buffer (large line support) + * cps: column position 1st char in buffer (large line support) * trnc: throw away data more than lim up to \n * mor: set if more data in line (not truncated) */ diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c index 122408b720fc..08cf94ce0e8b 100644 --- a/usr.bin/rpcgen/rpc_svcout.c +++ b/usr.bin/rpcgen/rpc_svcout.c @@ -325,7 +325,7 @@ write_programs(const char *storage) /* * write out definition of internal function (e.g. _printmsg_1(...)) - * which calls server's defintion of actual function (e.g. printmsg_1(...)). + * which calls server's definition of actual function (e.g. printmsg_1(...)). * Unpacks single user argument of printmsg_1 to call-by-value format * expected by printmsg_1. */ diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c index a9e76d920ca0..ed21cd7b4057 100644 --- a/usr.bin/rpcinfo/rpcinfo.c +++ b/usr.bin/rpcinfo/rpcinfo.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); */ /* - * We are for now defining PORTMAP here. It doesnt even compile + * We are for now defining PORTMAP here. It doesn't even compile * unless it is defined. */ #ifndef PORTMAP diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c index ed46344fd61b..366d0269a6b3 100644 --- a/usr.bin/systat/icmp6.c +++ b/usr.bin/systat/icmp6.c @@ -75,7 +75,7 @@ static struct icmp6stat icmp6stat, initstat, oldstat; 12999999999 time-to-live exceeded 999999999 time-to-line exceeded 13999999999 parameter problem 999999999 parameter problem 14999999999 neighbor solicitation 999999999 neighbor solicitation -15999999999 neighbor advertisment 999999999 neighbor advertisment +15999999999 neighbor advertisement 999999999 neighbor advertisement 16999999999 router advertisement 999999999 router solicitation 17 18 @@ -121,7 +121,7 @@ labelicmp6(void) B(12, "time-to-live exceeded"); B(13, "parameter problem"); B(14, "neighbor solicitation"); - B(15, "neighbor advertisment"); + B(15, "neighbor advertisement"); L(16, "router advertisement"); R(16, "router solicitation"); #undef L #undef R diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c index c8039417bfd9..81fead6434b5 100644 --- a/usr.bin/talk/ctl_transact.c +++ b/usr.bin/talk/ctl_transact.c @@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)ctl_transact.c 8.1 (Berkeley) 6/6/93"; /* * SOCKDGRAM is unreliable, so we must repeat messages if we have - * not recieved an acknowledgement within a reasonable amount + * not received an acknowledgement within a reasonable amount * of time */ void diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c index 12b69b567f3f..e48302ffb21e 100644 --- a/usr.bin/talk/invite.c +++ b/usr.bin/talk/invite.c @@ -87,7 +87,7 @@ invite_remote(void) announce_invite(); /* * Shut off the automatic messages for a while, - * so we can use the interupt timer to resend the invitation + * so we can use the interrupt timer to resend the invitation */ end_msgs(); setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0); @@ -117,7 +117,7 @@ invite_remote(void) } /* - * Routine called on interupt to re-invite the callee + * Routine called on interrupt to re-invite the callee */ /* ARGSUSED */ void diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h index 2aa248a29414..7e7faa6bd905 100644 --- a/usr.bin/tip/tip/tip.h +++ b/usr.bin/tip/tip/tip.h @@ -99,7 +99,7 @@ typedef char *v_name; /* whose name is it */ char v_type; /* for interpreting set's */ char v_access; /* protection of touchy ones */ - char *v_abrev; /* possible abreviation */ + char *v_abrev; /* possible abbreviation */ char *v_value; /* casted to a union later */ } value_t; @@ -162,7 +162,7 @@ typedef /* * Escape command table definitions -- * lookup in this table is performed when ``escapec'' is recognized - * at the begining of a line (as defined by the eolmarks variable). + * at the beginning of a line (as defined by the eolmarks variable). */ typedef diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index b815ffc67e70..8d44beecd50b 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1404,7 +1404,7 @@ compare_ivcsw(void *arg1, void *arg2) /* * proc_owner(pid) - returns the uid that owns process "pid", or -1 if * the process does not exist. - * It is EXTREMLY IMPORTANT that this function work correctly. + * It is EXTREMELY IMPORTANT that this function work correctly. * If top runs setuid root (as in SVR4), then this function * is the only thing that stands in the way of a serious * security problem. It validates requests for the "kill" diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h index 08fefec7ce33..6616ca94ef72 100644 --- a/usr.bin/vgrind/extern.h +++ b/usr.bin/vgrind/extern.h @@ -37,7 +37,7 @@ extern boolean _escaped; /* if last character was an escape */ extern char *s_start; /* start of the current string */ extern char *l_acmbeg; /* string introducing a comment */ extern char *l_acmend; /* string ending a comment */ -extern char *l_blkbeg; /* string begining of a block */ +extern char *l_blkbeg; /* string beginning of a block */ extern char *l_blkend; /* string ending a block */ extern char *l_chrbeg; /* delimiter for character constant */ extern char *l_chrend; /* delimiter for character constant */ diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c index 2fb62c436d38..5baaec0b5f10 100644 --- a/usr.bin/vgrind/vfontedpr.c +++ b/usr.bin/vgrind/vfontedpr.c @@ -110,7 +110,7 @@ static char pstack[PSMAX][PNAMELEN+1]; /* the procedure name stack */ char *l_acmbeg; /* string introducing a comment */ char *l_acmend; /* string ending a comment */ -char *l_blkbeg; /* string begining of a block */ +char *l_blkbeg; /* string beginning of a block */ char *l_blkend; /* string ending a block */ char *l_chrbeg; /* delimiter for character constant */ char *l_chrend; /* delimiter for character constant */ diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c index 06a412c2e208..e62882ff3a32 100644 --- a/usr.bin/xlint/lint1/decl.c +++ b/usr.bin/xlint/lint1/decl.c @@ -308,7 +308,7 @@ addtype(type_t *tp) /* now it can be only a combination of arithmetic types and void */ if (t == SIGNED || t == UNSIGN) { - /* remeber specifiers "signed" and "unsigned" in dcs->d_smod */ + /* remember specifiers "signed" and "unsigned" in dcs->d_smod */ if (dcs->d_smod != NOTSPEC) /* * more than one "signed" and/or "unsigned"; print @@ -545,7 +545,7 @@ popdecl(void) /* * casts and sizeof * Append all symbols declared in the abstract declaration - * to the list of symbols declared in the surounding decl. + * to the list of symbols declared in the surrounding decl. * or block. * XXX I'm not sure whether they should be removed from the * symbol table now or later. @@ -2580,8 +2580,8 @@ ledecl(sym_t *dsym) } /* - * Print an error or a warning if the symbol cant be initialized due - * to type/storage class. Returnvalue is 1 if an error has been + * Print an error or a warning if the symbol can't be initialized due + * to type/storage class. Return value is 1 if an error has been * detected. */ static int @@ -2613,7 +2613,7 @@ chkinit(sym_t *sym) } /* - * Create a symbole for an abstract declaration. + * Create a symbol for an abstract declaration. */ sym_t * aname(void) @@ -2895,7 +2895,7 @@ chktusg(sym_t *sym) if (!incompl(sym->s_type)) return; - /* complain alwasy about incomplet tags declared inside blocks */ + /* complain always about incomplete tags declared inside blocks */ if (!zflag || dcs->d_ctx != EXTERN) return; diff --git a/usr.bin/xlint/lint1/emit1.c b/usr.bin/xlint/lint1/emit1.c index e62549c63c05..762945feddbc 100644 --- a/usr.bin/xlint/lint1/emit1.c +++ b/usr.bin/xlint/lint1/emit1.c @@ -81,7 +81,7 @@ static void outfstrg(strg_t *); * 2 n typename only type name * * spaces are only for better readability - * additionaly it is possible to prepend the characters 'c' (for const) + * additionally it is possible to prepend the characters 'c' (for const) * and 'v' (for volatile) */ void diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c index 68ade02e4752..f34baa1ff2e7 100644 --- a/usr.bin/xlint/lint1/func.c +++ b/usr.bin/xlint/lint1/func.c @@ -59,15 +59,15 @@ int reached = 1; int rchflg; /* - * In conjunction with reached ontrols printing of "fallthrough on ..." + * In conjunction with reached controls printing of "fallthrough on ..." * warnings. * Reset by each statement and set by FALLTHROUGH, switch (switch1()) * and case (label()). * * Control statements if, for, while and switch do not reset ftflg because - * this must be done by the controled statement. At least for if this is + * this must be done by the controlled statement. At least for if this is * important because ** FALLTHROUGH ** after "if (expr) stmnt" is evaluated - * befor the following token, wich causes reduction of above, is read. + * before the following token, which causes reduction of above, is read. * This means that ** FALLTHROUGH ** after "if ..." would always be ignored. */ int ftflg; @@ -107,13 +107,13 @@ pos_t prflpos; pos_t scflpos; /* - * Are both plibflg and llibflg set, prototypes are writen as function + * Are both plibflg and llibflg set, prototypes are written as function * definitions to the output file. */ int plibflg; /* - * Nonzero means that no warnings about constands in conditional + * Nonzero means that no warnings about constants in conditional * context are printed. */ int ccflg; @@ -323,7 +323,7 @@ funcdef(sym_t *fsym) if (fsym->s_osdef && !fsym->s_type->t_proto) { if (sflag && hflag && strcmp(fsym->s_name, "main") != 0) - /* function definition is not a prototyp */ + /* function definition is not a prototype */ warning(286); } @@ -353,7 +353,7 @@ funcend(void) } /* - * This warning is printed only if the return value was implizitly + * This warning is printed only if the return value was implicitly * declared to be int. Otherwise the wrong return statement * has already printed a warning. */ diff --git a/usr.bin/xlint/lint1/mem1.c b/usr.bin/xlint/lint1/mem1.c index 735115cce4af..3edc6db10fbc 100644 --- a/usr.bin/xlint/lint1/mem1.c +++ b/usr.bin/xlint/lint1/mem1.c @@ -133,7 +133,7 @@ getfnid(const char *s) /* * Memory for declarations and other things which must be available * until the end of a block (or the end of the translation unit) - * are assoziated with the level (mblklev) of the block (or wiht 0). + * are associated with the level (mblklev) of the block (or with 0). * Because these memory is allocated in large blocks associated with * a given level it can be freed easily at the end of a block. */ diff --git a/usr.bin/xlint/lint2/chk.c b/usr.bin/xlint/lint2/chk.c index ddb9df677774..4062246a3010 100644 --- a/usr.bin/xlint/lint2/chk.c +++ b/usr.bin/xlint/lint2/chk.c @@ -447,11 +447,11 @@ chkau(hte_t *hte, int n, sym_t *def, sym_t *decl, pos_t *pos1p, char *pos1; /* - * If a function definition is available (def != NULL), we compair the + * If a function definition is available (def != NULL), we compare the * function call (call) with the definition. Otherwise, if a function * definition is available and it is not an old style definition - * (decl != NULL && TP(decl->s_type)->t_proto), we compair the call - * with this declaration. Otherwise we compair it with the first + * (decl != NULL && TP(decl->s_type)->t_proto), we compare the call + * with this declaration. Otherwise we compare it with the first * call we have found (call1). */ @@ -474,7 +474,7 @@ chkau(hte_t *hte, int n, sym_t *def, sym_t *decl, pos_t *pos1p, * of an argument does not match exactly the expected type. The * result are lots of warnings which are really not necessary. * We print a warning only if - * (0) at least one type is not an interger type and types differ + * (0) at least one type is not an integer type and types differ * (1) hflag is set and types differ * (2) types differ, except in signedness * If the argument is an integer constant whose msb is not set, @@ -482,7 +482,7 @@ chkau(hte_t *hte, int n, sym_t *def, sym_t *decl, pos_t *pos1p, * int). This is with and without hflag. * If the argument is an integer constant with value 0 and the * expected argument is of type pointer and the width of the - * interger constant is the same as the width of the pointer, + * integer constant is the same as the width of the pointer, * no warning is printed. */ t1 = arg1->t_tspec; @@ -490,7 +490,7 @@ chkau(hte_t *hte, int n, sym_t *def, sym_t *decl, pos_t *pos1p, if (isityp(t1) && isityp(t2) && !arg1->t_isenum && !arg2->t_isenum) { if (promote) { /* - * XXX Here is a problem: Althrough it is possible to + * XXX Here is a problem: Although it is possible to * pass an int where a char/short it expected, there * may be loss in significant digits. We should first * check for const arguments if they can be converted diff --git a/usr.bin/xlint/lint2/read.c b/usr.bin/xlint/lint2/read.c index 9dfecfdd87ff..0ffd611a3a6b 100644 --- a/usr.bin/xlint/lint2/read.c +++ b/usr.bin/xlint/lint2/read.c @@ -506,7 +506,7 @@ decldef(pos_t *posp, const char *cp) } /* - * Read an u-record (emited by lint1 if a symbol was used). + * Read an u-record (emitted by lint1 if a symbol was used). */ static void usedsym(pos_t *posp, const char *cp) diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c index de3b52710f6d..7980d6cc1ccb 100644 --- a/usr.bin/xlint/xlint/xlint.c +++ b/usr.bin/xlint/xlint/xlint.c @@ -80,7 +80,7 @@ static char *p2out; /* flags always passed to cc(1) */ static char **cflags; -/* flags for cc(1), controled by sflag/tflag */ +/* flags for cc(1), controlled by sflag/tflag */ static char **lcflags; /* flags for lint1 */ diff --git a/usr.bin/yacc/NEW_FEATURES b/usr.bin/yacc/NEW_FEATURES index b030c625b000..baab2ee9ba28 100644 --- a/usr.bin/yacc/NEW_FEATURES +++ b/usr.bin/yacc/NEW_FEATURES @@ -1,3 +1,5 @@ +$FreeBSD$ + The -r option has been implemented. The -r option tells Yacc to put the read-only tables in y.tab.c and the code and variables in y.code.c. Keith Bostic asked for this option so that :yyfix could be @@ -35,7 +37,7 @@ is %ident string -where string is a sequence of characters begining with a double quote +where string is a sequence of characters beginning with a double quote and ending with either a double quote or the next end-of-line, whichever comes first. The declaration will cause a #ident directive to be written near the start of the output file. diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c index 0521891312ae..f81f17305239 100644 --- a/usr.bin/yacc/reader.c +++ b/usr.bin/yacc/reader.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); /* The line size must be a positive integer. One hundred was chosen */ /* because few lines in Yacc input grammars exceed 100 characters. */ /* Note that if a line exceeds LINESIZE characters, the line buffer */ -/* will be expanded to accomodate it. */ +/* will be expanded to accommodate it. */ #define LINESIZE 100 |