Add media and player state support

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index e4ef44be787859a277f02a1421478ca062a76c10..87626e8f0df98902f8cb26f7aa513a52bc2df3c4 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -50,7 +50,7 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap)
     if (res == NULL)
         return -1;
     *strp = res;
-    return vsprintf (res, fmt, ap);
+    return vsnprintf (res, len, fmt, ap);
 #else
     /* HACK: vsnprintf in the WinCE API behaves like
      * the one in glibc 2.0 and doesn't return the number of characters
@@ -77,8 +77,7 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap)
         }
 
         /* Else try again with more space. */
-        if (n == -1)
-            size *= 2;  /* twice the old size */
+        size *= 2;  /* twice the old size */
 
         if ((np = (char *) realloc (res, size)) == NULL)
         {
@@ -151,7 +150,7 @@ static inline char *strndup (const char *str, size_t max)
 #endif
 
 #ifndef HAVE_STRSEP
-static inline char *vlc_strsep( char **ppsz_string, const char *psz_delimiters )
+static inline char *strsep( char **ppsz_string, const char *psz_delimiters )
 {
     char *psz_string = *ppsz_string;
     if( !psz_string )