utf: fileio 2

Change-Id: I4bf30a724eba96af85d45d9c3fafc7d83648e17e

5 files changed, 4 insertions, 21 deletions

diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_createdir.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_createdir.cpp
index e6b64cb..e99a709 100644
--- a/scilab/modules/fileio/sci_gateway/cpp/sci_createdir.cpp
+++ b/scilab/modules/fileio/sci_gateway/cpp/sci_createdir.cpp
@@ -54,7 +54,7 @@ types::Function::ReturnValue sci_createdir(types::typed_list &in, int _iRetCount
     {
         if (getWarningMode())
         {
-            sciprint(_("%ls: Warning: Directory '%ls' already exists.\n"), L"createdir", pstPath);
+            sciprint(_("%s: Warning: Directory '%s' already exists.\n"), "createdir", pstPath);
         }
         iRet = 1;
     }
diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_meof.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_meof.cpp
index debcc2e..ad1af38 100644
--- a/scilab/modules/fileio/sci_gateway/cpp/sci_meof.cpp
+++ b/scilab/modules/fileio/sci_gateway/cpp/sci_meof.cpp
@@ -68,7 +68,7 @@ types::Function::ReturnValue sci_meof(types::typed_list &in, int _iRetCount, typ
     {
         if (getWarningMode())
         {
-            sciprint(_("%ls: Cannot check the end of file whose descriptor is %d: File is not active.\n"), "meof", iFile);
+            sciprint(_("%s: Cannot check the end of file whose descriptor is %d: File is not active.\n"), "meof", iFile);
         }
         return types::Function::OK;
     }
diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_removedir.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_removedir.cpp
index fffa23b..96a8275 100644
--- a/scilab/modules/fileio/sci_gateway/cpp/sci_removedir.cpp
+++ b/scilab/modules/fileio/sci_gateway/cpp/sci_removedir.cpp
@@ -50,7 +50,7 @@ types::Function::ReturnValue sci_removedir(types::typed_list &in, int _iRetCount
     {
         if (getWarningMode())
         {
-            sciprint(_("%s: Warning: Directory '%ls' does not exist.\n"), "removedir", pstPath);
+            sciprint(_("%s: Warning: Directory '%s' does not exist.\n"), "removedir", pstPath);
         }
     }
     else
diff --git a/scilab/modules/fileio/src/c/FindFileExtension.c b/scilab/modules/fileio/src/c/FindFileExtension.c
index 7c43c1e..169a0da 100644
--- a/scilab/modules/fileio/src/c/FindFileExtension.c
+++ b/scilab/modules/fileio/src/c/FindFileExtension.c
@@ -49,13 +49,7 @@ char *FindFileExtension(char *filename)
         }
 #else
         {
-            wchar_t *wcFilename = to_wide_string(filename);
-            if (wcFilename)
-            {
-                extension = wide_string_to_UTF8(PathFindExtensionW(wcFilename));
-                FREE(wcFilename);
-                wcFilename = NULL;
-            }
+            extension = PathFindExtensionA(filename);
         }
 #endif
     }
diff --git a/scilab/modules/fileio/src/c/getlongpathname.h b/scilab/modules/fileio/src/c/getlongpathname.h
index 725aaa5..e211da9 100644
--- a/scilab/modules/fileio/src/c/getlongpathname.h
+++ b/scilab/modules/fileio/src/c/getlongpathname.h
@@ -27,16 +27,5 @@
 */
 FILEIO_IMPEXP char *getlongpathname(char *shortpathname, BOOL *convertok);
 
-/**
-* Retrieves the long path form of the specified path (wide string)
-* @param[in] short path name
-* @param[out] TRUE if conversion is ok
-* @return long path name
-* on Linux returns same path name
-* used for Windows
-*/
-FILEIO_IMPEXP wchar_t *getlongpathnameW(wchar_t *wcshortpathname, BOOL *convertok);
-
-
 #endif /* __GETLONGPATHNAME_H__ */
 /*--------------------------------------------------------------------------*/