From 4c4a1070febe5a140cac0357267af338b9852a7e Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 5 Jul 2007 22:01:07 +0000
Subject: Avoid code duplication and ugly config.h hack by using
 av_strlcat/av_strlcpy instead of plain strlcat/strlcpy

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23723 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 osdep/Makefile  |  2 --
 osdep/strlcat.c | 15 ---------------
 osdep/strlcpy.c | 22 ----------------------
 3 files changed, 39 deletions(-)

(limited to 'osdep')

diff --git a/osdep/Makefile b/osdep/Makefile
index 86c551e2a2..8c520c3e10 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -12,8 +12,6 @@ SRCS_COMMON-$(NEED_GLOB)             += glob-win.c
 SRCS_COMMON-$(NEED_SCANDIR)          += scandir.c
 SRCS_COMMON-$(NEED_SETENV)           += setenv.c
 SRCS_COMMON-$(NEED_SHMEM)            += shmem.c
-SRCS_COMMON-$(NEED_STRLCAT)          += strlcat.c
-SRCS_COMMON-$(NEED_STRLCPY)          += strlcpy.c
 SRCS_COMMON-$(NEED_STRSEP)           += strsep.c
 SRCS_COMMON-$(NEED_SWAB)             += swab.c
 SRCS_COMMON-$(NEED_VSSCANF)          += vsscanf.c
diff --git a/osdep/strlcat.c b/osdep/strlcat.c
index 1facc3333d..e69de29bb2 100644
--- a/osdep/strlcat.c
+++ b/osdep/strlcat.c
@@ -1,15 +0,0 @@
-/* strlcat implementation for systems that do not have it in libc
- * Time-stamp: <2004-03-14 njk>
- * (C) 2003-2004 Nicholas J. Kain <njk@aerifal.cx>
- */
-
-#include "config.h"
-
-unsigned int strlcat (char *dest, const char *src, unsigned int size)
-{
-	register char *d = dest;
-
-	for (; size > 0 && *d != '\0'; size--, d++);
-	return (d - dest) + strlcpy(d, src, size);
-}
-
diff --git a/osdep/strlcpy.c b/osdep/strlcpy.c
index 887461abbc..e69de29bb2 100644
--- a/osdep/strlcpy.c
+++ b/osdep/strlcpy.c
@@ -1,22 +0,0 @@
-/* strlcpy implementation for systems that do not have it in libc
- * Time-stamp: <2004-03-14 njk>
- * (C) 2003-2004 Nicholas J. Kain <njk@aerifal.cx>
- */
-
-#include "config.h"
-
-unsigned int strlcpy (char *dest, const char *src, unsigned int size)
-{
-	register unsigned int i = 0;
-
-	if (size > 0) {
-	size--;
-	for (i=0; size > 0 && src[i] != '\0'; ++i, size--)
-		dest[i] = src[i];
-
-	dest[i] = '\0';
-	}
-	while (src[i++]);
-
-	return i;
-}
-- 
cgit v1.2.3