summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/lib/libkern/bcmp.c6
-rw-r--r--sys/lib/libkern/bzero.c6
-rw-r--r--sys/lib/libkern/explicit_bzero.c6
-rw-r--r--sys/lib/libkern/ffs.c6
-rw-r--r--sys/lib/libkern/libkern.h3
-rw-r--r--sys/lib/libkern/memchr.c6
-rw-r--r--sys/lib/libkern/memcmp.c6
-rw-r--r--sys/lib/libkern/memset.c7
-rw-r--r--sys/lib/libkern/quad.h13
-rw-r--r--sys/lib/libkern/softfloat.h6
-rw-r--r--sys/lib/libkern/strchr.c6
-rw-r--r--sys/lib/libkern/strcmp.c6
-rw-r--r--sys/lib/libkern/strlcat.c7
-rw-r--r--sys/lib/libkern/strlcpy.c7
-rw-r--r--sys/lib/libkern/strlen.c6
-rw-r--r--sys/lib/libkern/strncasecmp.c7
-rw-r--r--sys/lib/libkern/strncmp.c6
-rw-r--r--sys/lib/libkern/strncpy.c6
-rw-r--r--sys/lib/libkern/strnlen.c7
-rw-r--r--sys/lib/libkern/strrchr.c7
-rw-r--r--sys/lib/libkern/timingsafe_bcmp.c6
21 files changed, 30 insertions, 106 deletions
diff --git a/sys/lib/libkern/bcmp.c b/sys/lib/libkern/bcmp.c
index 535744b4616..e9e1aba7f44 100644
--- a/sys/lib/libkern/bcmp.c
+++ b/sys/lib/libkern/bcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcmp.c,v 1.9 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: bcmp.c,v 1.10 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -29,11 +29,7 @@
* SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* bcmp -- vax cmpc3 instruction
diff --git a/sys/lib/libkern/bzero.c b/sys/lib/libkern/bzero.c
index 6115ba5812d..d6dac657802 100644
--- a/sys/lib/libkern/bzero.c
+++ b/sys/lib/libkern/bzero.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bzero.c,v 1.8 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: bzero.c,v 1.9 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -29,11 +29,7 @@
* SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* bzero -- vax movc5 instruction
diff --git a/sys/lib/libkern/explicit_bzero.c b/sys/lib/libkern/explicit_bzero.c
index 7550a2f0c8d..297fc7052c9 100644
--- a/sys/lib/libkern/explicit_bzero.c
+++ b/sys/lib/libkern/explicit_bzero.c
@@ -1,14 +1,10 @@
-/* $OpenBSD: explicit_bzero.c,v 1.1 2011/01/10 23:23:56 tedu Exp $ */
+/* $OpenBSD: explicit_bzero.c,v 1.2 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Public domain.
* Written by Ted Unangst
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* explicit_bzero - don't let the compiler optimize away bzero
diff --git a/sys/lib/libkern/ffs.c b/sys/lib/libkern/ffs.c
index 8710a6181cd..93f0e817911 100644
--- a/sys/lib/libkern/ffs.c
+++ b/sys/lib/libkern/ffs.c
@@ -1,15 +1,11 @@
-/* $OpenBSD: ffs.c,v 1.8 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: ffs.c,v 1.9 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Public domain.
* Written by Dale Rahn.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* ffs -- vax ffs instruction
diff --git a/sys/lib/libkern/libkern.h b/sys/lib/libkern/libkern.h
index 43f38bab50c..4e53f92fbc2 100644
--- a/sys/lib/libkern/libkern.h
+++ b/sys/lib/libkern/libkern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: libkern.h,v 1.32 2014/01/19 12:45:36 deraadt Exp $ */
+/* $OpenBSD: libkern.h,v 1.33 2014/06/10 04:16:57 deraadt Exp $ */
/* $NetBSD: libkern.h,v 1.7 1996/03/14 18:52:08 christos Exp $ */
/*-
@@ -152,6 +152,7 @@ int fls(int);
int flsl(long);
void *memchr(const void *, int, size_t);
int memcmp(const void *, const void *, size_t);
+void *memset(void *, int c, size_t len);
u_int32_t random(void);
int scanc(u_int, const u_char *, const u_char [], int);
int skpc(int, size_t, u_char *);
diff --git a/sys/lib/libkern/memchr.c b/sys/lib/libkern/memchr.c
index 91096cdac2f..b2fb2cfa230 100644
--- a/sys/lib/libkern/memchr.c
+++ b/sys/lib/libkern/memchr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memchr.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: memchr.c,v 1.6 2014/06/10 04:16:57 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,12 +32,8 @@
* SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
#define NULL ((char *)0)
-#endif
void *
memchr(const void *s, int c, size_t n)
diff --git a/sys/lib/libkern/memcmp.c b/sys/lib/libkern/memcmp.c
index b75bdab97f6..4d53a47193b 100644
--- a/sys/lib/libkern/memcmp.c
+++ b/sys/lib/libkern/memcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memcmp.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: memcmp.c,v 1.6 2014/06/10 04:16:57 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,11 +32,7 @@
* SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* Compare memory regions.
diff --git a/sys/lib/libkern/memset.c b/sys/lib/libkern/memset.c
index 66a9c8b64f5..d434fca6fc6 100644
--- a/sys/lib/libkern/memset.c
+++ b/sys/lib/libkern/memset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memset.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: memset.c,v 1.7 2014/06/10 04:16:57 deraadt Exp $ */
/* $NetBSD: memset.c,v 1.6 1998/03/27 05:35:47 cgd Exp $ */
/*-
@@ -35,14 +35,9 @@
#include <sys/types.h>
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#include <limits.h>
-#else
#include <sys/limits.h>
#include <sys/systm.h>
#include <lib/libkern/libkern.h>
-#endif
#define wsize sizeof(u_int)
#define wmask (wsize - 1)
diff --git a/sys/lib/libkern/quad.h b/sys/lib/libkern/quad.h
index a77d05139ed..41037912c02 100644
--- a/sys/lib/libkern/quad.h
+++ b/sys/lib/libkern/quad.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenBSD: quad.h,v 1.11 2009/11/07 23:09:35 jsg Exp $
+ * $OpenBSD: quad.h,v 1.12 2014/06/10 04:16:57 deraadt Exp $
*/
/*
@@ -50,11 +50,7 @@
*/
#include <sys/types.h>
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <limits.h>
-#else
#include <sys/limits.h>
-#endif
/*
* Depending on the desired operation, we view a `long long' (aka quad_t) in
@@ -103,6 +99,13 @@ quad_t __ashldi3(quad_t, qshift_t);
quad_t __ashrdi3(quad_t, qshift_t);
int __cmpdi2(quad_t, quad_t);
quad_t __divdi3(quad_t, quad_t);
+quad_t __fixdfdi(double);
+quad_t __fixsfdi(float);
+u_quad_t __fixunsdfdi(double);
+u_quad_t __fixunssfdi(float);
+double __floatdidf(quad_t);
+float __floatdisf(quad_t);
+double __floatunsdidf(u_quad_t);
quad_t __iordi3(quad_t, quad_t);
quad_t __lshldi3(quad_t, qshift_t);
quad_t __lshrdi3(quad_t, qshift_t);
diff --git a/sys/lib/libkern/softfloat.h b/sys/lib/libkern/softfloat.h
index cc5ed44172e..f469f6dd011 100644
--- a/sys/lib/libkern/softfloat.h
+++ b/sys/lib/libkern/softfloat.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softfloat.h,v 1.4 2008/10/07 22:06:29 martynas Exp $ */
+/* $OpenBSD: softfloat.h,v 1.5 2014/06/10 04:16:57 deraadt Exp $ */
/* $NetBSD: softfloat.h,v 1.1 2001/04/26 03:10:48 ross Exp $ */
/* This is a derivative work. */
@@ -68,11 +68,7 @@ this code that are retained.
#include <sys/types.h>
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <ieeefp.h>
-#else
#include "machine/ieeefp.h"
-#endif
#include <sys/endian.h>
/*
diff --git a/sys/lib/libkern/strchr.c b/sys/lib/libkern/strchr.c
index 9af2ea0ac5c..4916a437398 100644
--- a/sys/lib/libkern/strchr.c
+++ b/sys/lib/libkern/strchr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strchr.c,v 1.4 2007/11/25 18:25:34 deraadt Exp $ */
+/* $OpenBSD: strchr.c,v 1.5 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 2004 Daniel Hartmeier
@@ -31,12 +31,8 @@
*/
#include <sys/types.h>
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
#define NULL ((char *)0)
-#endif
char *
strchr(const char *s, int c)
diff --git a/sys/lib/libkern/strcmp.c b/sys/lib/libkern/strcmp.c
index f3439a075c3..ef3b3644c7b 100644
--- a/sys/lib/libkern/strcmp.c
+++ b/sys/lib/libkern/strcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcmp.c,v 1.10 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: strcmp.c,v 1.11 2014/06/10 04:16:57 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,11 +32,7 @@
* SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* Compare strings.
diff --git a/sys/lib/libkern/strlcat.c b/sys/lib/libkern/strlcat.c
index 4de6675cb71..21ad07c658b 100644
--- a/sys/lib/libkern/strlcat.c
+++ b/sys/lib/libkern/strlcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlcat.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: strlcat.c,v 1.7 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,12 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <sys/types.h>
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* Appends src to string dst of size siz (unlike strncat, siz is the
diff --git a/sys/lib/libkern/strlcpy.c b/sys/lib/libkern/strlcpy.c
index 043f5c53ddd..88cc1b5029a 100644
--- a/sys/lib/libkern/strlcpy.c
+++ b/sys/lib/libkern/strlcpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlcpy.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: strlcpy.c,v 1.7 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,12 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <sys/types.h>
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* Copy src to string dst of size siz. At most siz-1 characters
diff --git a/sys/lib/libkern/strlen.c b/sys/lib/libkern/strlen.c
index 7cd4e8e7e12..825b5d609b9 100644
--- a/sys/lib/libkern/strlen.c
+++ b/sys/lib/libkern/strlen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlen.c,v 1.9 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: strlen.c,v 1.10 2014/06/10 04:16:57 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,11 +29,7 @@
* SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
size_t
strlen(const char *str)
diff --git a/sys/lib/libkern/strncasecmp.c b/sys/lib/libkern/strncasecmp.c
index 20576784860..905808fb812 100644
--- a/sys/lib/libkern/strncasecmp.c
+++ b/sys/lib/libkern/strncasecmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncasecmp.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: strncasecmp.c,v 1.6 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -29,11 +29,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
+
#include <lib/libkern/libkern.h>
-#endif
int
strncasecmp(const char *s1, const char *s2, size_t n)
diff --git a/sys/lib/libkern/strncmp.c b/sys/lib/libkern/strncmp.c
index 13fb1aa2c3b..eafc02f4843 100644
--- a/sys/lib/libkern/strncmp.c
+++ b/sys/lib/libkern/strncmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncmp.c,v 1.10 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: strncmp.c,v 1.11 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -29,11 +29,7 @@
* SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
int
strncmp(const char *s1, const char *s2, size_t n)
diff --git a/sys/lib/libkern/strncpy.c b/sys/lib/libkern/strncpy.c
index 2972692aa1a..0fca960c28d 100644
--- a/sys/lib/libkern/strncpy.c
+++ b/sys/lib/libkern/strncpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncpy.c,v 1.8 2009/10/27 23:59:35 deraadt Exp $ */
+/* $OpenBSD: strncpy.c,v 1.9 2014/06/10 04:16:57 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,11 +32,7 @@
* SUCH DAMAGE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
/*
* Copy src to dst, truncating or null-padding to always copy n bytes.
diff --git a/sys/lib/libkern/strnlen.c b/sys/lib/libkern/strnlen.c
index ac439d066a2..92be016c055 100644
--- a/sys/lib/libkern/strnlen.c
+++ b/sys/lib/libkern/strnlen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strnlen.c,v 1.1 2012/04/26 01:22:31 matthew Exp $ */
+/* $OpenBSD: strnlen.c,v 1.2 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -17,12 +17,7 @@
*/
#include <sys/types.h>
-
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
size_t
strnlen(const char *str, size_t maxlen)
diff --git a/sys/lib/libkern/strrchr.c b/sys/lib/libkern/strrchr.c
index 05ac5b7ff5f..abe10b1a0e4 100644
--- a/sys/lib/libkern/strrchr.c
+++ b/sys/lib/libkern/strrchr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strrchr.c,v 1.1 2007/11/25 18:25:34 deraadt Exp $ */
+/* $OpenBSD: strrchr.c,v 1.2 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 2004 Daniel Hartmeier
@@ -30,13 +30,8 @@
*
*/
-#include <sys/types.h>
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
#define NULL ((char *)0)
-#endif
char *
strrchr(const char *s, int c)
diff --git a/sys/lib/libkern/timingsafe_bcmp.c b/sys/lib/libkern/timingsafe_bcmp.c
index 8e25a2394de..0dc43e9813e 100644
--- a/sys/lib/libkern/timingsafe_bcmp.c
+++ b/sys/lib/libkern/timingsafe_bcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timingsafe_bcmp.c,v 1.1 2010/07/20 15:28:44 matthew Exp $ */
+/* $OpenBSD: timingsafe_bcmp.c,v 1.2 2014/06/10 04:16:57 deraadt Exp $ */
/*
* Copyright (c) 2010 Damien Miller. All rights reserved.
*
@@ -15,11 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <string.h>
-#else
#include <lib/libkern/libkern.h>
-#endif
int
timingsafe_bcmp(const void *b1, const void *b2, size_t n)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 08:25:29 +0000