diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-08-04 23:44:29 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-08-04 23:44:29 +0000 |
| commit | 4e652d4d4774328655449fc7545711106347d2ae (patch) | |
| tree | 3ab2533f0abdd93e5c1c646cf339ba7813446622 | |
| parent | f5089bf55cd66d1941039622ea9434e2a5480521 (diff) | |
| download | mandoc-4e652d4d4774328655449fc7545711106347d2ae.tar.gz mandoc-4e652d4d4774328655449fc7545711106347d2ae.tar.zst mandoc-4e652d4d4774328655449fc7545711106347d2ae.zip | |
remove strnlen(3) compat, we no longer use it
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | compat_strnlen.c | 43 | ||||
| -rw-r--r-- | config.h.post | 3 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | test-strnlen.c | 8 |
5 files changed, 1 insertions, 59 deletions
@@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.424 2014/07/13 09:39:32 schwarze Exp $ +# $Id: Makefile,v 1.425 2014/08/04 23:44:29 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -87,7 +87,6 @@ TESTSRCS = test-fgetln.c \ test-reallocarray.c \ test-strlcat.c \ test-strlcpy.c \ - test-strnlen.c \ test-strptime.c SRCS = LICENSE \ @@ -111,7 +110,6 @@ SRCS = LICENSE \ compat_strcasestr.c \ compat_strlcat.c \ compat_strlcpy.c \ - compat_strnlen.c \ compat_strsep.c \ config.h.post \ config.h.pre \ @@ -240,7 +238,6 @@ COMPAT_OBJS = compat_fgetln.o \ compat_strcasestr.o \ compat_strlcat.o \ compat_strlcpy.o \ - compat_strnlen.o \ compat_strsep.o # === DEPENDENCY HANDLING ============================================== diff --git a/compat_strnlen.c b/compat_strnlen.c deleted file mode 100644 index 386c4898..00000000 --- a/compat_strnlen.c +++ /dev/null @@ -1,43 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef HAVE_STRNLEN - -int dummy; - -#else - -/* ($)OpenBSD: strnlen.c,v 1.4 2012/04/26 01:22:31 matthew Exp $ */ - -/* - * Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <sys/types.h> -#include <string.h> - -size_t -strnlen(const char *str, size_t maxlen) -{ - const char *cp; - - for (cp = str; maxlen != 0 && *cp != '\0'; cp++, maxlen--) - ; - - return (size_t)(cp - str); -} - -#endif diff --git a/config.h.post b/config.h.post index f2d24297..07b53415 100644 --- a/config.h.post +++ b/config.h.post @@ -32,9 +32,6 @@ extern size_t strlcat(char *, const char *, size_t); #ifndef HAVE_STRLCPY extern size_t strlcpy(char *, const char *, size_t); #endif -#ifndef HAVE_STRNLEN -extern size_t strnlen(const char *, size_t); -#endif #ifndef HAVE_STRSEP extern char *strsep(char **, const char *); #endif @@ -38,7 +38,6 @@ runtest reallocarray REALLOCARRAY runtest strcasestr STRCASESTR runtest strlcat STRLCAT runtest strlcpy STRLCPY -runtest strnlen STRNLEN runtest strptime STRPTIME runtest strsep STRSEP echo diff --git a/test-strnlen.c b/test-strnlen.c deleted file mode 100644 index 0bb69791..00000000 --- a/test-strnlen.c +++ /dev/null @@ -1,8 +0,0 @@ -#include <string.h> - -int -main(void) -{ - const char s[1] = { 'a' }; - return(1 != strnlen(s, 1)); -} |