[vlc-devel] commit: C++-proofing ( Rémi Denis-Courmont )

git version control git at videolan.org
Tue Dec 16 19:12:07 CET 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Tue Dec 16 20:12:00 2008 +0200| [01b080ab11dc0d5fd8e52eb4152d08fd66a83f7f] | committer: Rémi Denis-Courmont 

C++-proofing

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01b080ab11dc0d5fd8e52eb4152d08fd66a83f7f
---

 include/vlc_charset.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index d181d15..ddd50df 100644
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -86,7 +86,7 @@ static inline char *FromWide (const wchar_t *wide)
  */
 static inline char *FromLatin1 (const char *latin)
 {
-    char *str = malloc (2 * strlen (latin) + 1), *utf8 = str;
+    char *str = (char *)malloc (2 * strlen (latin) + 1), *utf8 = str;
     unsigned char c;
 
     if (str == NULL)
@@ -104,7 +104,7 @@ static inline char *FromLatin1 (const char *latin)
     }
     *(utf8++) = '\0';
 
-    utf8 = realloc (str, utf8 - str);
+    utf8 = (char *)realloc (str, utf8 - str);
     return utf8 ? utf8 : str;
 }
 




More information about the vlc-devel mailing list