Permalink
Browse files

Remove unused strlcat and strlcpy

  • Loading branch information...
1 parent 17d7434 commit acd96d49a5ee51dd3e59e9f997b56a37b816b506 @dbussink dbussink committed Jan 4, 2013
Showing with 0 additions and 131 deletions.
  1. +0 −61 vm/util/strlcat.cpp
  2. +0 −8 vm/util/strlcat.hpp
  3. +0 −54 vm/util/strlcpy.cpp
  4. +0 −8 vm/util/strlcpy.hpp
View
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1998 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.
- */
-
-#ifndef HAVE_STRLCAT
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left). At most siz-1 characters
- * will be copied. Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat (char *dst, const char *src, size_t siz)
-{
- register char *d = dst;
- register const char *s = src;
- register size_t n = siz;
- size_t dlen;
-
- /* Find the end of dst and adjust bytes left but don't go past end */
- while (n-- && *d)
- d++;
-
- dlen = d - dst;
- n = siz - dlen;
-
- if (!n)
- return (dlen + strlen (s));
-
- while (*s) {
- if (n != 1) {
- *d++ = *s;
- n--;
- }
-
- s++;
- }
-
- *d = '\0';
-
- return (dlen + (s - src)); /* count does not include NUL */
-}
-
-#endif
View
@@ -1,8 +0,0 @@
-#ifndef STRLCAT_H
-#define STRLCAT_H
-
-#ifndef HAVE_STRLCAT
-size_t strlcat (char *dst, const char *src, size_t siz);
-#endif
-
-#endif
View
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1998 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.
- */
-
-#ifndef HAVE_STRLCPY
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Copy src to string dst of size siz. At most siz-1 characters
- * will be copied. Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-strlcpy (char *dst, const char *src, size_t siz)
-{
- register char *d = dst;
- register const char *s = src;
- register size_t n = siz;
-
- /* Copy as many bytes as will fit */
- if (n && --n) {
- do {
- if (!(*d++ = *s++))
- break;
- } while (--n);
- }
-
- /* Not enough room in dst, add NUL and traverse rest of src */
- if (!n) {
- if (siz)
- *d = '\0'; /* NUL-terminate dst */
-
- while(*s++)
- ;
- }
-
- return (s - src - 1); /* count does not include NUL */
-}
-
-#endif
View
@@ -1,8 +0,0 @@
-#ifndef STRLCPY_H
-#define STRLCPY_H
-
-#ifndef HAVE_STRLCPY
-size_t strlcpy (char *dst, const char *src, size_t siz);
-#endif
-
-#endif

0 comments on commit acd96d4

Please sign in to comment.