summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hessler <phessler@cvs.openbsd.org>2019-02-10 16:42:36 +0000
committerPeter Hessler <phessler@cvs.openbsd.org>2019-02-10 16:42:36 +0000
commit029d0047c4edb5891d11b15c9f100faf06c16906 (patch)
tree0cfc63cc0dbf9cd7d581828fe8e1bf01d800a059
parent018ff054f6fde41099b0b7fcd206caabdc7ba803 (diff)
"non-existant" is one of those words that don't exist, so use "non-existent"
instead From Pamela Mosiejczuk, many thanks! OK phessler@ deraadt@
-rw-r--r--lib/libssl/d1_both.c4
-rw-r--r--regress/sys/kern/unveil/syscalls.c8
-rw-r--r--sys/net/if_pfsync.c4
-rw-r--r--sys/scsi/mpath.c8
-rw-r--r--sys/uvm/uvm_map.c4
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgDelete.pm4
-rw-r--r--usr.sbin/rmt/rmt.c4
7 files changed, 18 insertions, 18 deletions
diff --git a/lib/libssl/d1_both.c b/lib/libssl/d1_both.c
index f75604ef68d..8f3cc610b89 100644
--- a/lib/libssl/d1_both.c
+++ b/lib/libssl/d1_both.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_both.c,v 1.56 2018/11/08 22:28:52 jsing Exp $ */
+/* $OpenBSD: d1_both.c,v 1.57 2019/02/10 16:42:35 phessler Exp $ */
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -1046,7 +1046,7 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
item = pqueue_find(s->d1->sent_messages, seq64be);
if (item == NULL) {
#ifdef DEBUG
- fprintf(stderr, "retransmit: message %d non-existant\n", seq);
+ fprintf(stderr, "retransmit: message %d non-existent\n", seq);
#endif
*found = 0;
return 0;
diff --git a/regress/sys/kern/unveil/syscalls.c b/regress/sys/kern/unveil/syscalls.c
index 81caa286406..8a744b006e8 100644
--- a/regress/sys/kern/unveil/syscalls.c
+++ b/regress/sys/kern/unveil/syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscalls.c,v 1.20 2019/01/17 03:26:19 beck Exp $ */
+/* $OpenBSD: syscalls.c,v 1.21 2019/02/10 16:42:35 phessler Exp $ */
/*
* Copyright (c) 2017-2019 Bob Beck <beck@openbsd.org>
@@ -605,8 +605,8 @@ static int
test_stat2(int do_uv)
{
if (do_uv) {
- printf("testing stat components to nonexistant \"rw\"\n");
- if (unveil("/usr/share/man/nonexistant", "rw") == -1)
+ printf("testing stat components to nonexistent \"rw\"\n");
+ if (unveil("/usr/share/man/nonexistent", "rw") == -1)
err(1, "%s:%d - unveil", __FILE__, __LINE__);
}
struct stat sb;
@@ -616,7 +616,7 @@ test_stat2(int do_uv)
UV_SHOULD_SUCCEED((stat("/usr", &sb) == -1), "stat");
UV_SHOULD_SUCCEED((stat("/usr/share", &sb) == -1), "stat");
UV_SHOULD_SUCCEED((stat("/usr/share/man", &sb) == -1), "stat");
- UV_SHOULD_ENOENT((stat("/usr/share/man/nonexistant", &sb) == -1), "stat");
+ UV_SHOULD_ENOENT((stat("/usr/share/man/nonexistent", &sb) == -1), "stat");
return 0;
}
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 8d842e48466..20a0136e838 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pfsync.c,v 1.261 2018/10/03 01:24:14 visa Exp $ */
+/* $OpenBSD: if_pfsync.c,v 1.262 2019/02/10 16:42:35 phessler Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -2062,7 +2062,7 @@ pfsync_update_state_req(struct pf_state *st)
struct pfsync_softc *sc = pfsyncif;
if (sc == NULL)
- panic("pfsync_update_state_req: nonexistant instance");
+ panic("pfsync_update_state_req: nonexistent instance");
if (ISSET(st->state_flags, PFSTATE_NOSYNC)) {
if (st->sync_state != PFSYNC_S_NONE)
diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c
index abc1acf094c..9c016f24552 100644
--- a/sys/scsi/mpath.c
+++ b/sys/scsi/mpath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpath.c,v 1.41 2015/08/23 01:55:39 tedu Exp $ */
+/* $OpenBSD: mpath.c,v 1.42 2019/02/10 16:42:35 phessler Exp $ */
/*
* Copyright (c) 2009 David Gwynne <dlg@openbsd.org>
@@ -189,7 +189,7 @@ mpath_cmd(struct scsi_xfer *xs)
#ifdef DIAGNOSTIC
if (d == NULL)
- panic("mpath_cmd issued against nonexistant device");
+ panic("mpath_cmd issued against nonexistent device");
#endif
if (ISSET(xs->flags, SCSI_POLL)) {
@@ -404,7 +404,7 @@ mpath_minphys(struct buf *bp, struct scsi_link *link)
#ifdef DIAGNOSTIC
if (d == NULL)
- panic("mpath_minphys against nonexistant device");
+ panic("mpath_minphys against nonexistent device");
#endif
mtx_enter(&d->d_mtx);
@@ -548,7 +548,7 @@ mpath_path_detach(struct mpath_path *p)
#ifdef DIAGNOSTIC
if (g == NULL)
- panic("mpath: detaching a path from a nonexistant bus");
+ panic("mpath: detaching a path from a nonexistent bus");
#endif
d = g->g_dev;
p->p_group = NULL;
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index d97f60fdf09..311b556c9d6 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_map.c,v 1.239 2018/10/31 08:50:25 kettenis Exp $ */
+/* $OpenBSD: uvm_map.c,v 1.240 2019/02/10 16:42:35 phessler Exp $ */
/* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */
/*
@@ -1491,7 +1491,7 @@ uvm_mapent_merge(struct vm_map *map, struct vm_map_entry *e1,
* Attempt forward and backward joining of entry.
*
* Returns entry after joins.
- * We are guaranteed that the amap of entry is either non-existant or
+ * We are guaranteed that the amap of entry is either non-existent or
* has never been used.
*/
struct vm_map_entry*
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
index c1ca5b7fcb2..b490e7e550a 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: PkgDelete.pm,v 1.45 2018/07/10 10:37:59 espie Exp $
+# $OpenBSD: PkgDelete.pm,v 1.46 2019/02/10 16:42:35 phessler Exp $
#
# Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
#
@@ -299,7 +299,7 @@ sub process_set
}
}
if (keys %$bad2 > 0) {
- $state->errsay("#1 depends on non-existant #2",
+ $state->errsay("#1 depends on non-existent #2",
$set->print, join(' ', sort keys %$bad2));
if (fix_bad_dependencies($state)) {
for my $pkg (keys %$bad2) {
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index 7979cca61a2..d1542b3083d 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmt.c,v 1.21 2018/04/26 12:42:51 guenther Exp $ */
+/* $OpenBSD: rmt.c,v 1.22 2019/02/10 16:42:35 phessler Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -169,7 +169,7 @@ top:
f &= ~O_CREAT;
} else if (wflag) {
/*
- * Require, and force creation of, a nonexistant file,
+ * Require, and force creation of, a nonexistent file,
* unless we are reopening the last opened file again,
* in which case it is opened read-only.
*/