Drop old strlcat/cpy emulation functions.

diff --git a/cups/string.c b/cups/string.c
index 1ee76e8d2213a9a5dc1b36e8ed431137b8982db8..22b0ef555e2988597eb91bedf36080126cdeec8a 100644 (file)
--- a/cups/string.c
+++ b/cups/string.c
@@ -1106,91 +1106,6 @@ _cups_strncasecmp(const char *s, /* I - First string */
 }
 
 
-#ifndef HAVE_STRLCAT
-/*
- * '_cups_cupsConcatString()' - Safely concatenate two strings.
- */
-
-size_t                                 /* O - Length of string */
-_cups_cupsConcatString(char       *dst,                /* O - Destination string */
-              const char *src,         /* I - Source string */
-             size_t     size)          /* I - Size of destination string buffer */
-{
-  size_t       srclen;                 /* Length of source string */
-  size_t       dstlen;                 /* Length of destination string */
-
-
- /*
-  * Figure out how much room is left...
-  */
-
-  dstlen = strlen(dst);
-
-  if (size < (dstlen + 1))
-    return (dstlen);                   /* No room, return immediately... */
-
-  size -= dstlen + 1;
-
- /*
-  * Figure out how much room is needed...
-  */
-
-  srclen = strlen(src);
-
- /*
-  * Copy the appropriate amount...
-  */
-
-  if (srclen > size)
-    srclen = size;
-
-  memmove(dst + dstlen, src, srclen);
-  dst[dstlen + srclen] = '\0';
-
-  return (dstlen + srclen);
-}
-#endif /* !HAVE_STRLCAT */
-
-
-#ifndef HAVE_STRLCPY
-/*
- * '_cups_cupsCopyString()' - Safely copy two strings.
- */
-
-size_t                                 /* O - Length of string */
-_cups_cupsCopyString(char       *dst,          /* O - Destination string */
-              const char *src,         /* I - Source string */
-             size_t      size)         /* I - Size of destination string buffer */
-{
-  size_t       srclen;                 /* Length of source string */
-
-
-  if (size == 0)
-    return (0);
-
- /*
-  * Figure out how much room is needed...
-  */
-
-  size --;
-
-  srclen = strlen(src);
-
- /*
-  * Copy the appropriate amount...
-  */
-
-  if (srclen > size)
-    srclen = size;
-
-  memmove(dst, src, srclen);
-  dst[srclen] = '\0';
-
-  return (srclen);
-}
-#endif /* !HAVE_STRLCPY */
-
-
 /*
  * 'compare_sp_items()' - Compare two string pool items...
  */