[vlc-commits] os2: inline ToLocale/LocaleFree

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jun 12 23:27:23 2015 +0300| [0974fd35bbbec00406b05c355fbe2791745ec32d] | committer: Rémi Denis-Courmont

os2: inline ToLocale/LocaleFree

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

 src/os2/filesystem.c |   32 ++++++++++++++++----------------
 src/os2/plugin.c     |    6 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/os2/filesystem.c b/src/os2/filesystem.c
index 51a4447..5017abe 100644
--- a/src/os2/filesystem.c
+++ b/src/os2/filesystem.c
@@ -65,7 +65,7 @@ int vlc_open (const char *filename, int flags, ...)
         mode = va_arg (ap, unsigned int);
     va_end (ap);
 
-    const char *local_name = ToLocale (filename);
+    const char *local_name = ToLocaleDup (filename);
 
     if (local_name == NULL)
     {
@@ -77,7 +77,7 @@ int vlc_open (const char *filename, int flags, ...)
     if (fd != -1)
         fcntl (fd, F_SETFD, FD_CLOEXEC);
 
-    LocaleFree (local_name);
+    free (local_name);
     return fd;
 }
 
@@ -109,7 +109,7 @@ int vlc_openat (int dir, const char *filename, int flags, ...)
  */
 int vlc_mkdir (const char *dirname, mode_t mode)
 {
-    char *locname = ToLocale (dirname);
+    char *locname = ToLocaleDup (dirname);
     if (unlikely(locname == NULL))
     {
         errno = ENOENT;
@@ -117,7 +117,7 @@ int vlc_mkdir (const char *dirname, mode_t mode)
     }
 
     int res = mkdir (locname, mode);
-    LocaleFree (locname);
+    free (locname);
     return res;
 }
 
@@ -130,7 +130,7 @@ int vlc_mkdir (const char *dirname, mode_t mode)
  */
 DIR *vlc_opendir (const char *dirname)
 {
-    const char *locname = ToLocale (dirname);
+    const char *locname = ToLocaleDup (dirname);
     if (unlikely(locname == NULL))
     {
         errno = ENOENT;
@@ -139,7 +139,7 @@ DIR *vlc_opendir (const char *dirname)
 
     DIR *dir = opendir (locname);
 
-    LocaleFree (locname);
+    free (locname);
 
     return dir;
 }
@@ -180,14 +180,14 @@ char *vlc_readdir( DIR *dir )
     if (val != 0)
         errno = val;
     else if (ent != NULL)
-        path = FromLocaleDup (ent->d_name);
+        path = FromCharset ("", ent->d_name, strlen(ent->d_name));
     free (buf);
     return path;
 }
 
 static int vlc_statEx (const char *filename, struct stat *buf, bool deref)
 {
-    const char *local_name = ToLocale (filename);
+    const char *local_name = ToLocaleDup (filename);
     if (unlikely(local_name == NULL))
     {
         errno = ENOENT;
@@ -196,7 +196,7 @@ static int vlc_statEx (const char *filename, struct stat *buf, bool deref)
 
     int res = deref ? stat (local_name, buf)
                     : lstat (local_name, buf);
-    LocaleFree (local_name);
+    free (local_name);
     return res;
 }
 
@@ -231,7 +231,7 @@ int vlc_lstat (const char *filename, struct stat *buf)
  */
 int vlc_unlink (const char *filename)
 {
-    const char *local_name = ToLocale (filename);
+    const char *local_name = ToLocaleDup (filename);
     if (unlikely(local_name == NULL))
     {
         errno = ENOENT;
@@ -239,7 +239,7 @@ int vlc_unlink (const char *filename)
     }
 
     int ret = unlink (local_name);
-    LocaleFree (local_name);
+    free (local_name);
     return ret;
 }
 
@@ -253,22 +253,22 @@ int vlc_unlink (const char *filename)
  */
 int vlc_rename (const char *oldpath, const char *newpath)
 {
-    const char *lo = ToLocale (oldpath);
+    const char *lo = ToLocaleDup (oldpath);
     if (lo == NULL)
         goto error;
 
-    const char *ln = ToLocale (newpath);
+    const char *ln = ToLocaleDup (newpath);
     if (ln == NULL)
     {
-        LocaleFree (lo);
+        free (lo);
 error:
         errno = ENOENT;
         return -1;
     }
 
     int ret = rename (lo, ln);
-    LocaleFree (lo);
-    LocaleFree (ln);
+    free (lo);
+    free (ln);
     return ret;
 }
 
diff --git a/src/os2/plugin.c b/src/os2/plugin.c
index c16b827..d24e26b 100644
--- a/src/os2/plugin.c
+++ b/src/os2/plugin.c
@@ -49,16 +49,16 @@ int module_Load( vlc_object_t *p_this, const char *psz_file,
                  module_handle_t *p_handle, bool lazy )
 {
     const int flags = lazy ? RTLD_LAZY : RTLD_NOW;
-    char *path = ToLocale( psz_file );
+    char *path = ToLocaleDup( psz_file );
 
     module_handle_t handle = dlopen( path, flags );
     if( handle == NULL )
     {
         msg_Warn( p_this, "cannot load module `%s' (%s)", path, dlerror() );
-        LocaleFree( path );
+        free( path );
         return -1;
     }
-    LocaleFree( path );
+    free( path );
     *p_handle = handle;
     return 0;
 }