summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/arch.c4
-rw-r--r--usr.bin/make/error.h4
-rw-r--r--usr.bin/make/gnode.h4
-rw-r--r--usr.bin/nohup/nohup.c6
-rw-r--r--usr.bin/rdistd/server.c10
-rw-r--r--usr.bin/sudo/parse.yacc2
-rw-r--r--usr.bin/sup/src/supcmain.c4
-rw-r--r--usr.bin/tail/read.c8
-rw-r--r--usr.bin/xlint/lint1/decl.c6
-rw-r--r--usr.bin/xlint/lint1/init.c6
-rw-r--r--usr.bin/xlint/lint1/tree.c6
11 files changed, 30 insertions, 30 deletions
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 45a0b42c733..21fa4ebe9ef 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: arch.c,v 1.49 2001/06/07 13:53:22 espie Exp $ */
+/* $OpenBSD: arch.c,v 1.50 2001/09/19 10:58:07 mpech Exp $ */
/* $NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $ */
/*
@@ -634,7 +634,7 @@ ArchMTimeMember(archive, member, hash)
*
* Results:
* svr4list: just read a list of names
- * NULL: error occured
+ * NULL: error occurred
* extended name
*
* Side-effect:
diff --git a/usr.bin/make/error.h b/usr.bin/make/error.h
index 095b9c7f3a2..7436b34c7b7 100644
--- a/usr.bin/make/error.h
+++ b/usr.bin/make/error.h
@@ -1,7 +1,7 @@
#ifndef ERROR_H
#define ERROR_H
/* $OpenPackages$ */
-/* $OpenBSD: error.h,v 1.6 2001/05/23 12:34:42 espie Exp $ */
+/* $OpenBSD: error.h,v 1.7 2001/09/19 10:58:07 mpech Exp $ */
/*
* Copyright (c) 2001 Marc Espie.
@@ -39,7 +39,7 @@
* takes a format string and two arguments.
*
* Finish Finish things up by printing the number of
- * errors which occured, as passed to it, and
+ * errors which occurred, as passed to it, and
* exiting.
*/
extern void Error(char *, ...);
diff --git a/usr.bin/make/gnode.h b/usr.bin/make/gnode.h
index 7ba6e3c46c5..17d94d72be2 100644
--- a/usr.bin/make/gnode.h
+++ b/usr.bin/make/gnode.h
@@ -1,7 +1,7 @@
#ifndef GNODE_H
#define GNODE_H
/* $OpenPackages$ */
-/* $OpenBSD: gnode.h,v 1.1 2001/05/23 12:34:43 espie Exp $ */
+/* $OpenBSD: gnode.h,v 1.2 2001/09/19 10:58:07 mpech Exp $ */
/*
* Copyright (c) 2001 Marc Espie.
@@ -84,7 +84,7 @@ struct GNode_ {
* mode only)
* MADE - Was out-of-date and has been made
* UPTODATE - Was already up-to-date
- * ERROR - An error occured while it was being
+ * ERROR - An error occurred while it was being
* made (used only in compat mode)
* ABORTED - The target was aborted due to
* an error making an inferior (compat).
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 861a63354de..a11cda04569 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nohup.c,v 1.7 2001/08/19 18:54:47 mickey Exp $ */
+/* $OpenBSD: nohup.c,v 1.8 2001/09/19 10:58:07 mpech Exp $ */
/* $NetBSD: nohup.c,v 1.6 1995/08/31 23:35:25 jtc Exp $ */
/*
@@ -44,7 +44,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)nohup.c 5.4 (Berkeley) 6/1/90";
#endif
-static char rcsid[] = "$OpenBSD: nohup.c,v 1.7 2001/08/19 18:54:47 mickey Exp $";
+static char rcsid[] = "$OpenBSD: nohup.c,v 1.8 2001/09/19 10:58:07 mpech Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -64,7 +64,7 @@ static void usage();
/* nohup shall exit with one of the following values:
126 - The utility was found but could not be invoked.
- 127 - An error occured in the nohup utility, or the utility could
+ 127 - An error occurred in the nohup utility, or the utility could
not be found. */
#define EXIT_NOEXEC 126
#define EXIT_NOTFOUND 127
diff --git a/usr.bin/rdistd/server.c b/usr.bin/rdistd/server.c
index 6c216b08110..9754d949f5d 100644
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.8 1999/02/04 23:18:57 millert Exp $ */
+/* $OpenBSD: server.c,v 1.9 2001/09/19 10:58:07 mpech Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -38,7 +38,7 @@ static char RCSid[] =
"$From: server.c,v 6.85 1996/03/12 22:55:38 mcooper Exp $";
#else
static char RCSid[] =
-"$OpenBSD: server.c,v 1.8 1999/02/04 23:18:57 millert Exp $";
+"$OpenBSD: server.c,v 1.9 2001/09/19 10:58:07 mpech Exp $";
#endif
static char sccsid[] = "@(#)server.c 5.3 (Berkeley) 6/7/86";
@@ -594,7 +594,7 @@ static void query(name)
if (s > 0)
(void) sendcmd(QC_ONNFS, NULL);
- /* Either the above check was true or an error occured */
+ /* Either the above check was true or an error occurred */
/* and is_nfs_mounted sent the error message */
if (s != 0) {
*ptarget = CNULL;
@@ -609,7 +609,7 @@ static void query(name)
if (s > 0)
(void) sendcmd(QC_ONRO, NULL);
- /* Either the above check was true or an error occured */
+ /* Either the above check was true or an error occurred */
/* and is_ro_mounted sent the error message */
if (s != 0) {
*ptarget = CNULL;
@@ -795,7 +795,7 @@ static void recvfile(new, opts, mode, owner, group, mtime, atime, size)
(void) close(f);
(void) unlink(new);
fatalerr(
- "Read error occured while receiving file.");
+ "Read error occurred while receiving file.");
finish();
}
amt -= j;
diff --git a/usr.bin/sudo/parse.yacc b/usr.bin/sudo/parse.yacc
index 5f4ff9562b5..53899089c1a 100644
--- a/usr.bin/sudo/parse.yacc
+++ b/usr.bin/sudo/parse.yacc
@@ -189,7 +189,7 @@ void
yyerror(s)
char *s;
{
- /* Save the line the first error occured on. */
+ /* Save the line the first error occurred on. */
if (errorlineno == -1)
errorlineno = sudolineno ? sudolineno - 1 : 0;
if (s) {
diff --git a/usr.bin/sup/src/supcmain.c b/usr.bin/sup/src/supcmain.c
index ea63df571f8..50a64503b48 100644
--- a/usr.bin/sup/src/supcmain.c
+++ b/usr.bin/sup/src/supcmain.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: supcmain.c,v 1.11 2001/05/04 22:16:16 millert Exp $ */
+/* $OpenBSD: supcmain.c,v 1.12 2001/09/19 10:58:07 mpech Exp $ */
/*
* Copyright (c) 1992 Carnegie Mellon University
@@ -248,7 +248,7 @@
*
* 03-Feb-86 Glenn Marcy (gm0w) at Carnegie-Mellon University
* Fixed small bug in signon that didn't retry connections if an
- * error occured on the first attempt to connect. [V5.12]
+ * error occurred on the first attempt to connect. [V5.12]
*
* 26-Jan-86 Glenn Marcy (gm0w) at Carnegie-Mellon University
* New command interface. Added -bBDEO flags and "delete",
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 728d9bd498d..1b4d8d7a63c 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: read.c,v 1.4 2000/06/23 17:04:46 ericj Exp $ */
+/* $OpenBSD: read.c,v 1.5 2001/09/19 10:58:07 mpech Exp $ */
/* $NetBSD: read.c,v 1.4 1994/11/23 07:42:07 jtc Exp $ */
/*-
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: read.c,v 1.4 2000/06/23 17:04:46 ericj Exp $";
+static char rcsid[] = "$OpenBSD: read.c,v 1.5 2001/09/19 10:58:07 mpech Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -67,7 +67,7 @@ static char rcsid[] = "$OpenBSD: read.c,v 1.4 2000/06/23 17:04:46 ericj Exp $";
* it is displayed from the character closest to the beginning of the input to
* the end.
*
- * A non-zero return means an (non-fatal) error occured.
+ * A non-zero return means an (non-fatal) error occurred.
*
*/
int
@@ -138,7 +138,7 @@ bytes(fp, off)
* it is displayed from the line closest to the beginning of the input to
* the end.
*
- * A non-zero return means an (non-fatal) error occured.
+ * A non-zero return means an (non-fatal) error occurred.
*
*/
int
diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c
index ef9c2f6434b..f2a54cb3c59 100644
--- a/usr.bin/xlint/lint1/decl.c
+++ b/usr.bin/xlint/lint1/decl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: decl.c,v 1.4 1998/07/29 03:14:48 millert Exp $ */
+/* $OpenBSD: decl.c,v 1.5 2001/09/19 10:58:07 mpech 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.4 1998/07/29 03:14:48 millert Exp $";
+static char rcsid[] = "$OpenBSD: decl.c,v 1.5 2001/09/19 10:58:07 mpech Exp $";
#endif
#include <sys/param.h>
@@ -3090,7 +3090,7 @@ glchksz(sym)
if (sym->s_def == TDEF) {
if (sym->s_type->t_tspec == FUNC)
/*
- * this can happen if an syntax error occured
+ * this can happen if an syntax error occurred
* after a function declaration
*/
return;
diff --git a/usr.bin/xlint/lint1/init.c b/usr.bin/xlint/lint1/init.c
index 6a8902dfee4..3d56f25c07c 100644
--- a/usr.bin/xlint/lint1/init.c
+++ b/usr.bin/xlint/lint1/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.2 1996/06/26 05:44:14 deraadt Exp $ */
+/* $OpenBSD: init.c,v 1.3 2001/09/19 10:58:07 mpech Exp $ */
/* $NetBSD: init.c,v 1.4 1995/10/02 17:21:37 jpo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: init.c,v 1.2 1996/06/26 05:44:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.3 2001/09/19 10:58:07 mpech Exp $";
#endif
#include <stdlib.h>
@@ -41,7 +41,7 @@ static char rcsid[] = "$OpenBSD: init.c,v 1.2 1996/06/26 05:44:14 deraadt Exp $"
#include "lint1.h"
/*
- * initerr is set as soon as a fatal error occured in an initialisation.
+ * 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).
*/
diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c
index e9b3f3c475c..2ab3833ba4e 100644
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.4 1998/07/29 03:14:50 millert Exp $ */
+/* $OpenBSD: tree.c,v 1.5 2001/09/19 10:58:07 mpech 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.4 1998/07/29 03:14:50 millert Exp $";
+static char rcsid[] = "$OpenBSD: tree.c,v 1.5 2001/09/19 10:58:07 mpech Exp $";
#endif
#include <stdlib.h>
@@ -671,7 +671,7 @@ build(op, ln, rn)
break;
}
- /* Return if an error occured. */
+ /* Return if an error occurred. */
if (ntn == NULL)
return (NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 20:19:06 +0000