summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2007-05-21 17:01:50 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2007-05-21 17:01:50 +0000
commit01e4d117800e4631cc66c25da8f68df5697a780f (patch)
tree0692bff651a5f3d5220fd7f2727b57075ef08f12
parent668beb1868c18b6799bec2b2d0f7bcd89d83bc3e (diff)
Add ECANCELED and EOVERFLOW. For canceled (async) operations and conversion
overflows, respectively. (EOVERFLOW from espie@) don't bump libc, as there are currently no functions that use them, but it doesn't hurt to have them around. as discussed with deraadt@, espie@, miod@ and otto@ ok deraadt@ espie@ miod@ otto@
-rw-r--r--lib/libc/gen/errlist.c5
-rw-r--r--sys/sys/errno.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/libc/gen/errlist.c b/lib/libc/gen/errlist.c
index 092608c9dba..909b831960b 100644
--- a/lib/libc/gen/errlist.c
+++ b/lib/libc/gen/errlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: errlist.c,v 1.10 2006/08/04 21:35:51 beck Exp $ */
+/* $OpenBSD: errlist.c,v 1.11 2007/05/21 17:01:49 jasper Exp $ */
/*
* Copyright (c) 1982, 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -139,5 +139,8 @@ const char *const
"Illegal byte sequence", /* 84 - EILSEQ */
"No medium found", /* 85 - ENOMEDIUM */
"Wrong medium type", /* 86 - EMEDIUMTYPE */
+ /* 87 - EOVERFLOW */
+ "Value too large to be stored in data type",
+ "Operation canceled", /* 88 - ECANCELED */
};
int _sys_nerr = { sizeof _sys_errlist/sizeof _sys_errlist[0] };
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 4b0c7ef70ee..74a815ab3e0 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: errno.h,v 1.18 2007/03/18 15:27:53 espie Exp $ */
+/* $OpenBSD: errno.h,v 1.19 2007/05/21 17:01:49 jasper Exp $ */
/* $NetBSD: errno.h,v 1.10 1996/01/20 01:33:53 jtc Exp $ */
/*
@@ -156,12 +156,14 @@
#define ENEEDAUTH 81 /* Need authenticator */
#define EIPSEC 82 /* IPsec processing failure */
#define ENOATTR 83 /* Attribute not found */
-#endif
+#endif /* __BSD_VISIBLE */
#define EILSEQ 84 /* Illegal byte sequence */
#if __BSD_VISIBLE
#define ENOMEDIUM 85 /* No medium found */
#define EMEDIUMTYPE 86 /* Wrong Medium Type */
-#define ELAST 86 /* Must be equal largest errno */
+#define EOVERFLOW 87 /* Conversion overflow */
+#define ECANCELED 88 /* Operation canceled */
+#define ELAST 88 /* Must be equal largest errno */
#endif /* __BSD_VISIBLE */
#ifdef _KERNEL