* mdocml: remove strnlen(3) compat, we no longer use it
@ 2014-08-04 23:44 schwarze
0 siblings, 0 replies; 2+ messages in thread
From: schwarze @ 2014-08-04 23:44 UTC (permalink / raw)
To: source
Log Message:
-----------
remove strnlen(3) compat, we no longer use it
Modified Files:
--------------
mdocml:
Makefile
config.h.post
configure
Removed Files:
-------------
mdocml:
compat_strnlen.c
test-strnlen.c
Revision Data
-------------
--- 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
--- 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));
-}
Index: configure
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lconfigure -Lconfigure -u -p -r1.4 -r1.5
--- configure
+++ configure
@@ -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
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.424
retrieving revision 1.425
diff -LMakefile -LMakefile -u -p -r1.424 -r1.425
--- Makefile
+++ Makefile
@@ -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 ==============================================
Index: config.h.post
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/config.h.post,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lconfig.h.post -Lconfig.h.post -u -p -r1.9 -r1.10
--- config.h.post
+++ config.h.post
@@ -32,9 +32,6 @@ extern size_t strlcat(char *, const ch
#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
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 2+ messages in thread
* mdocml: remove strnlen(3) compat, we no longer use it
@ 2014-08-04 23:45 schwarze
0 siblings, 0 replies; 2+ messages in thread
From: schwarze @ 2014-08-04 23:45 UTC (permalink / raw)
To: source
Log Message:
-----------
remove strnlen(3) compat, we no longer use it
Tags:
----
VERSION_1_12
Modified Files:
--------------
mdocml:
Makefile
config.h.post
configure
Removed Files:
-------------
mdocml:
compat_strnlen.c
test-strnlen.c
Revision Data
-------------
--- 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
--- 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));
-}
Index: configure
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/configure,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lconfigure -Lconfigure -u -p -r1.1.2.3 -r1.1.2.4
--- configure
+++ configure
@@ -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
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.395.2.18
retrieving revision 1.395.2.19
diff -LMakefile -LMakefile -u -p -r1.395.2.18 -r1.395.2.19
--- Makefile
+++ Makefile
@@ -83,7 +83,6 @@ TESTSRCS = test-betoh64.c \
test-reallocarray.c \
test-strlcat.c \
test-strlcpy.c \
- test-strnlen.c \
test-strptime.c
SRCS = LICENSE \
@@ -109,7 +108,6 @@ SRCS = LICENSE \
compat_strcasestr.c \
compat_strlcat.c \
compat_strlcpy.c \
- compat_strnlen.c \
compat_strsep.c \
config.h.post \
config.h.pre \
@@ -233,7 +231,6 @@ COMPAT_OBJS = compat_fgetln.o \
compat_strcasestr.o \
compat_strlcat.o \
compat_strlcpy.o \
- compat_strnlen.o \
compat_strsep.o
# === DEPENDENCY HANDLING ==============================================
Index: config.h.post
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/config.h.post,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -Lconfig.h.post -Lconfig.h.post -u -p -r1.6.2.6 -r1.6.2.7
--- config.h.post
+++ config.h.post
@@ -44,9 +44,6 @@ extern size_t strlcat(char *, const ch
#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
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-04 23:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-04 23:44 mdocml: remove strnlen(3) compat, we no longer use it schwarze
2014-08-04 23:45 schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).