summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-06 11:57:10 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-06 11:57:10 +0000
commite3b183dc3f56d4de72aea2d2e8b02cc4ac938922 (patch)
treeeb3c8d274ba00275e797f106f34e3f5f8918037f /osdep
parentd621bc66d2ae9b9e3d375add71b1b45c6aa66e7f (diff)
downloadmpv-e3b183dc3f56d4de72aea2d2e8b02cc4ac938922.tar.bz2
mpv-e3b183dc3f56d4de72aea2d2e8b02cc4ac938922.tar.xz
- fix gcc warnings, strlcat/strlcpy prototypes
- fix bad sscanf usage in geometry.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15059 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'osdep')
-rw-r--r--osdep/strl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/osdep/strl.c b/osdep/strl.c
index 22e4cb56c3..8c0949a889 100644
--- a/osdep/strl.c
+++ b/osdep/strl.c
@@ -7,7 +7,7 @@
#include "../config.h"
#ifndef HAVE_STRLCPY
-unsigned int strlcpy (char *dest, char *src, unsigned int size)
+unsigned int strlcpy (char *dest, const char *src, unsigned int size)
{
register unsigned int i;
@@ -21,7 +21,7 @@ unsigned int strlcpy (char *dest, char *src, unsigned int size)
#endif
#ifndef HAVE_STRLCAT
-unsigned int strlcat (char *dest, char *src, unsigned int size)
+unsigned int strlcat (char *dest, const char *src, unsigned int size)
{
#if 0
register unsigned int i, j;
@@ -33,7 +33,8 @@ unsigned int strlcat (char *dest, char *src, unsigned int size)
dest[i] = '\0';
return i;
#else
- register char *d = dest, *s = src;
+ register char *d = dest;
+ register const char *s = src;
for (; size > 0 && *d != '\0'; size--, d++);
for (; size > 0 && *s != '\0'; size--, d++, s++)