summaryrefslogtreecommitdiff
path: root/lib/libc/string
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-06-10 04:17:38 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-06-10 04:17:38 +0000
commitb96cedb312c1947b4b6934ddeff7529155e97918 (patch)
treecb5d39de21a6de14532d5c18581cb01aa555eddd /lib/libc/string
parent74f6da5d981b9a1caa39a2fc4c2ecaac4da4bd1f (diff)
mop up ifndef KERNEL goo; ok miod
Diffstat (limited to 'lib/libc/string')
-rw-r--r--lib/libc/string/bcmp.c6
-rw-r--r--lib/libc/string/bzero.c6
-rw-r--r--lib/libc/string/explicit_bzero.c6
-rw-r--r--lib/libc/string/ffs.c6
-rw-r--r--lib/libc/string/strcat.c6
-rw-r--r--lib/libc/string/strcmp.c6
-rw-r--r--lib/libc/string/strcpy.c6
-rw-r--r--lib/libc/string/strlen.c6
-rw-r--r--lib/libc/string/strncmp.c6
-rw-r--r--lib/libc/string/strncpy.c6
-rw-r--r--lib/libc/string/strnlen.c6
-rw-r--r--lib/libc/string/timingsafe_bcmp.c6
12 files changed, 12 insertions, 60 deletions
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index fd5c93121ee..f64672990c6 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcmp.c,v 1.9 2008/03/19 03:00:23 ray Exp $ */
+/* $OpenBSD: bcmp.c,v 1.10 2014/06/10 04:17:37 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/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
index 4d267d4f401..fdd3d9cc8da 100644
--- a/lib/libc/string/bzero.c
+++ b/lib/libc/string/bzero.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bzero.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: bzero.c,v 1.8 2014/06/10 04:17:37 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/lib/libc/string/explicit_bzero.c b/lib/libc/string/explicit_bzero.c
index fd2948ca44e..5124df23caf 100644
--- a/lib/libc/string/explicit_bzero.c
+++ b/lib/libc/string/explicit_bzero.c
@@ -1,14 +1,10 @@
-/* $OpenBSD: explicit_bzero.c,v 1.1 2014/01/22 21:06:45 tedu Exp $ */
+/* $OpenBSD: explicit_bzero.c,v 1.2 2014/06/10 04:17:37 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/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 7dec1613a82..de4480a7efd 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -1,15 +1,11 @@
-/* $OpenBSD: ffs.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: ffs.c,v 1.8 2014/06/10 04:17:37 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/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index 7cea5229fb6..646c9c20909 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcat.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: strcat.c,v 1.9 2014/06/10 04:17:37 deraadt Exp $ */
/*
* Copyright (c) 1988 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
#if defined(APIWARN)
__warn_references(strcat,
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index 816fd111ac5..d1b6c50d791 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcmp.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: strcmp.c,v 1.8 2014/06/10 04:17:37 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/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index 71d90d41002..5a9001e4310 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcpy.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: strcpy.c,v 1.9 2014/06/10 04:17:37 deraadt Exp $ */
/*
* Copyright (c) 1988 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
#if defined(APIWARN)
__warn_references(strcpy,
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index 12d9ec4dadb..7e0e27b1d8d 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlen.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: strlen.c,v 1.8 2014/06/10 04:17:37 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/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index 0aea80d7d90..0a4ddc1d9e3 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncmp.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: strncmp.c,v 1.8 2014/06/10 04:17:37 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/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index 4426cbe2e3f..5003a199a9b 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncpy.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: strncpy.c,v 1.7 2014/06/10 04:17:37 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/lib/libc/string/strnlen.c b/lib/libc/string/strnlen.c
index a5e13ae04e2..872cfa6ccea 100644
--- a/lib/libc/string/strnlen.c
+++ b/lib/libc/string/strnlen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strnlen.c,v 1.4 2012/04/26 01:22:31 matthew Exp $ */
+/* $OpenBSD: strnlen.c,v 1.5 2014/06/10 04:17:37 deraadt Exp $ */
/*
* Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -18,11 +18,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/lib/libc/string/timingsafe_bcmp.c b/lib/libc/string/timingsafe_bcmp.c
index 9c4287cf63c..0b736154ca8 100644
--- a/lib/libc/string/timingsafe_bcmp.c
+++ b/lib/libc/string/timingsafe_bcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timingsafe_bcmp.c,v 1.1 2010/09/24 13:33:00 matthew Exp $ */
+/* $OpenBSD: timingsafe_bcmp.c,v 1.2 2014/06/10 04:17:37 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-11-28 16:06:18 +0000