diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2005-07-20 13:23:59 +0000 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2005-07-20 13:23:59 +0000 |
| commit | 36da2cba5b16489e11d6a250d1133d60edfb78ce (patch) | |
| tree | c232b28b15fdcc48573f60136741f613bbb23345 /strlcpy.c | |
| parent | 58528fcbcc6c71465dc3a6f0d11df856bbc7f88f (diff) | |
| download | fetchmail-36da2cba5b16489e11d6a250d1133d60edfb78ce.tar.gz fetchmail-36da2cba5b16489e11d6a250d1133d60edfb78ce.tar.bz2 fetchmail-36da2cba5b16489e11d6a250d1133d60edfb78ce.zip | |
Clean up strlc??.c and hook them up.
svn path=/trunk/; revision=4139
Diffstat (limited to 'strlcpy.c')
| -rw-r--r-- | strlcpy.c | 25 |
1 files changed, 0 insertions, 25 deletions
@@ -17,28 +17,10 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif - -#include <sys/cdefs.h> -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: strlcpy.c,v 1.14 2003/10/27 00:12:42 lukem Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#ifdef _LIBC -#include "namespace.h" -#endif #include <sys/types.h> #include <assert.h> #include <string.h> -#ifdef _LIBC -# ifdef __weak_alias -__weak_alias(strlcpy, _strlcpy) -# endif -#endif - #if !HAVE_STRLCPY /* * Copy src to string dst of size siz. At most siz-1 characters @@ -46,11 +28,7 @@ __weak_alias(strlcpy, _strlcpy) * Returns strlen(src); if retval >= siz, truncation occurred. */ size_t -#ifdef _LIBC -_strlcpy(dst, src, siz) -#else strlcpy(dst, src, siz) -#endif char *dst; const char *src; size_t siz; @@ -59,9 +37,6 @@ strlcpy(dst, src, siz) const char *s = src; size_t n = siz; - _DIAGASSERT(dst != NULL); - _DIAGASSERT(src != NULL); - /* Copy as many bytes as will fit */ if (n != 0 && --n != 0) { do { |