From d70f697f4d3253ffa39c0db9a2e831b509f3d7a9 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Wed, 3 Sep 2014 19:33:17 +0200
Subject: [PATCH] STRNLEN fallback isn't used anywhere.
---
src/configure.in | 1 -
src/port.c | 9 ---------
src/port.h | 7 ++-----
3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/configure.in b/src/configure.in
index b870ebfc76..cee201869f 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -4577,7 +4577,6 @@ AC_CHECK_FUNCS( \
sigaction \
sigvec \
strcasecmp \
- strnlen \
strchr \
strerror \
times \
diff --git a/src/port.c b/src/port.c
index 9baeb5a505..3f0d3666ab 100644
--- a/src/port.c
+++ b/src/port.c
@@ -262,15 +262,6 @@ PMOD_EXPORT int STRCASECMP(const char *a,const char *b)
}
#endif
-#ifndef HAVE_STRNLEN
-size_t STRNLEN(const char *s, size_t maxlen)
-{
- char *tmp=MEMCHR(s,0,maxlen);
- if(tmp) return tmp-s;
- return maxlen;
-}
-#endif
-
#ifndef HAVE_MEMSET
void *MEMSET(void *s,int c,size_t n)
{
diff --git a/src/port.h b/src/port.h
index c472f7684b..8142f04868 100644
--- a/src/port.h
+++ b/src/port.h
@@ -164,11 +164,8 @@ PMOD_EXPORT int STRCASECMP(const char *a,const char *b);
# define STRCASECMP strcasecmp
#endif
-#ifndef HAVE_STRNLEN
-PMOD_EXPORT size_t STRNLEN(const char *a,size_t len);
-#else
-# define STRNLEN strnlen
-#endif
+#define HAVE_STRNLEN 1
+#define STRNLEN strnlen
#define HAVE_STRNCMP 1
#define STRNCMP strncmp
--
GitLab