[MPlayer-cvslog] CVS: main/osdep strl.c,1.1,1.2

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/osdep
In directory mail:/var2/tmp/cvs-serv9436/osdep

Modified Files:
	strl.c 
Log Message:
- fix gcc warnings, strlcat/strlcpy prototypes
- fix bad sscanf usage in geometry.c


Index: strl.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/strl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strl.c	25 Jun 2004 16:49:52 -0000	1.1
+++ strl.c	6 Apr 2005 11:57:10 -0000	1.2
@@ -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 @@
 #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 @@
 	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++)