Mercurial > mplayer.hg
diff osdep/strl.c @ 15058:f48dc20c9185
- fix gcc warnings, strlcat/strlcpy prototypes
- fix bad sscanf usage in geometry.c
author | rathann |
---|---|
date | Wed, 06 Apr 2005 11:57:10 +0000 |
parents | 9a495bdc3a1e |
children | da29ac12242d |
line wrap: on
line diff
--- a/osdep/strl.c Wed Apr 06 11:53:45 2005 +0000 +++ b/osdep/strl.c Wed Apr 06 11:57:10 2005 +0000 @@ -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++)