[vlc-commits] skins2: replace all fopen() with vlc_fopen()

Erwan Tulou git at videolan.org
Fri Jun 12 22:03:11 CEST 2015


vlc/vlc-2.2 | branch: master | Erwan Tulou <erwan10 at videolan.org> | Fri Jun 12 14:37:05 2015 +0200| [80f1016779f86db6878920a5a60c7ba35e41df86] | committer: Erwan Tulou

skins2: replace all fopen() with vlc_fopen()

(cherry picked from commit 369d697c91052d07aacdd11d233084cf4df4745c)
Signed-off-by: Erwan Tulou <erwan10 at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=80f1016779f86db6878920a5a60c7ba35e41df86
---

 modules/gui/skins2/src/ft2_font.cpp     |    2 +-
 modules/gui/skins2/src/theme_loader.cpp |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/skins2/src/ft2_font.cpp b/modules/gui/skins2/src/ft2_font.cpp
index 51a9ade..855640b 100644
--- a/modules/gui/skins2/src/ft2_font.cpp
+++ b/modules/gui/skins2/src/ft2_font.cpp
@@ -62,7 +62,7 @@ bool FT2Font::init()
         return false;
     }
 
-    FILE *file = fopen( m_name.c_str(), "rb" );
+    FILE *file = vlc_fopen( m_name.c_str(), "rb" );
     if( !file )
     {
         msg_Dbg( getIntf(), "failed to open font %s (%s)",
diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index de99320..eee6219 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -238,7 +238,7 @@ bool ThemeLoader::extractFileInZip( unzFile file, const string &rootDir,
             return false;
         }
         makedir( basePath.c_str() );
-        FILE *fout = fopen( fullPath.c_str(), "wb" );
+        FILE *fout = vlc_fopen( fullPath.c_str(), "wb" );
         if( fout == NULL )
         {
             msg_Err( getIntf(), "error opening %s", fullPath.c_str() );
@@ -600,7 +600,7 @@ int tar_extract_all( TAR *t, char *prefix )
                 remaining = getoct( buffer.header.size, 12 );
                 if( !remaining ) outfile = NULL; else
                 {
-                    outfile = fopen( fname, "wb" );
+                    outfile = vlc_fopen( fname, "wb" );
                     if( outfile == NULL )
                     {
                         /* try creating directory */
@@ -610,7 +610,7 @@ int tar_extract_all( TAR *t, char *prefix )
                             *p = '\0';
                             makedir( fname );
                             *p = '/';
-                            outfile = fopen( fname, "wb" );
+                            outfile = vlc_fopen( fname, "wb" );
                             if( !outfile )
                             {
                                 fprintf( stderr, "tar couldn't create %s\n",



More information about the vlc-commits mailing list