[corlib] Remove unused icall

diff --git a/mcs/class/corlib/System.IO/MonoIO.cs b/mcs/class/corlib/System.IO/MonoIO.cs
index e195b080e88a46caf773b94523756541894c0c7b..9d816f40a5952a5e7edcb570a187b34eec2d5427 100644 (file)
--- a/mcs/class/corlib/System.IO/MonoIO.cs
+++ b/mcs/class/corlib/System.IO/MonoIO.cs
@@ -599,9 +599,6 @@ namespace System.IO
                        [MethodImplAttribute (MethodImplOptions.InternalCall)]
                        get;
                }
-
-               [MethodImplAttribute (MethodImplOptions.InternalCall)]
-               public extern static int GetTempPath(out string path);
        }
 }
 

diff --git a/mono/io-layer/io.c b/mono/io-layer/io.c
index ba25cb3730721bd49b13d20b62e9cc35cf6c07f9..685a822749100c2215ded9dd302e080a1d8f5106 100644 (file)
--- a/mono/io-layer/io.c
+++ b/mono/io-layer/io.c
@@ -3420,48 +3420,6 @@ gboolean CreatePipe (gpointer *readpipe, gpointer *writepipe,
        return(TRUE);
 }
 
-guint32 GetTempPath (guint32 len, gunichar2 *buf)
-{
-       gchar *tmpdir=g_strdup (g_get_tmp_dir ());
-       gunichar2 *tmpdir16=NULL;
-       glong dirlen;
-       gsize bytes;
-       guint32 ret;
-       
-       if(tmpdir[strlen (tmpdir)]!='/') {
-               g_free (tmpdir);
-               tmpdir=g_strdup_printf ("%s/", g_get_tmp_dir ());
-       }
-       
-       tmpdir16=mono_unicode_from_external (tmpdir, &bytes);
-       if(tmpdir16==NULL) {
-               g_free (tmpdir);
-               return(0);
-       } else {
-               dirlen=(bytes/2);
-               
-               if(dirlen+1>len) {
-                       DEBUG ("%s: Size %d smaller than needed (%ld)",
-                                  __func__, len, dirlen+1);
-               
-                       ret=dirlen+1;
-               } else {
-                       /* Add the terminator */
-                       memset (buf, '\0', bytes+2);
-                       memcpy (buf, tmpdir16, bytes);
-               
-                       ret=dirlen;
-               }
-       }
-
-       if(tmpdir16!=NULL) {
-               g_free (tmpdir16);
-       }
-       g_free (tmpdir);
-       
-       return(ret);
-}
-
 #ifdef HAVE_GETFSSTAT
 /* Darwin has getfsstat */
 gint32 GetLogicalDriveStrings (guint32 len, gunichar2 *buf)

diff --git a/mono/io-layer/io.h b/mono/io-layer/io.h
index e8627764812f3e98632ca244254d96fa7efc823d..12a1310d96784cf7bb40bb5a1c8c6789ebc6b145 100644 (file)
--- a/mono/io-layer/io.h
+++ b/mono/io-layer/io.h
@@ -210,7 +210,6 @@ extern guint32 GetCurrentDirectory (guint32 length, gunichar2 *buffer);
 extern gboolean SetCurrentDirectory (const gunichar2 *path);
 extern gboolean CreatePipe (gpointer *readpipe, gpointer *writepipe,
                            WapiSecurityAttributes *security, guint32 size);
-extern guint32 GetTempPath (guint32 len, gunichar2 *buf);
 extern gint32 GetLogicalDriveStrings (guint32 len, gunichar2 *buf);
 extern gboolean GetDiskFreeSpaceEx(const gunichar2 *path_name, WapiULargeInteger *free_bytes_avail,
                                   WapiULargeInteger *total_number_of_bytes,

diff --git a/mono/io-layer/wapi-remap.h b/mono/io-layer/wapi-remap.h
index 6db10c716ab4b526b485d03e429b550b75965df8..123755888b590792818522f1d80016c2525a74e9 100644 (file)
--- a/mono/io-layer/wapi-remap.h
+++ b/mono/io-layer/wapi-remap.h
@@ -50,7 +50,6 @@
 #define GetCurrentDirectory wapi_GetCurrentDirectory 
 #define SetCurrentDirectory wapi_SetCurrentDirectory 
 #define CreatePipe wapi_CreatePipe 
-#define GetTempPath wapi_GetTempPath 
 #define GetLogicalDriveStrings wapi_GetLogicalDriveStrings 
 #define GetDiskFreeSpaceEx wapi_GetDiskFreeSpaceEx
 #define GetDriveType wapi_GetDriveType

diff --git a/mono/metadata/file-io.c b/mono/metadata/file-io.c
index 2dc8f8aa761908a846dd808b2d24c8aa033652a1..fec434715b57dd6b963524948abf281552d5fed5 100644 (file)
--- a/mono/metadata/file-io.c
+++ b/mono/metadata/file-io.c
@@ -1177,38 +1177,6 @@ ves_icall_System_IO_MonoIO_get_InvalidPathChars ()
        return chars;
 }
 
-gint32
-ves_icall_System_IO_MonoIO_GetTempPath (MonoString **mono_name)
-{
-       gunichar2 *name;
-       int ret;
-
-       MONO_PREPARE_BLOCKING;
-       name=g_new0 (gunichar2, 256);
-       
-       ret=GetTempPath (256, name);
-       if(ret>255) {
-               /* Buffer was too short. Try again... */
-               g_free (name);
-               name=g_new0 (gunichar2, ret+2); /* include the terminator */
-               ret=GetTempPath (ret, name);
-       }
-       MONO_FINISH_BLOCKING;
-       
-       if(ret>0) {
-#ifdef DEBUG
-               g_message ("%s: Temp path is [%s] (len %d)", __func__, name, ret);
-#endif
-
-               mono_gc_wbarrier_generic_store ((gpointer) mono_name,
-                               (MonoObject*) mono_string_new_utf16 (mono_domain_get (), name, ret));
-       }
-
-       g_free (name);
-       
-       return(ret);
-}
-
 void ves_icall_System_IO_MonoIO_Lock (HANDLE handle, gint64 position,
                                      gint64 length, gint32 *error)
 {

diff --git a/mono/metadata/file-io.h b/mono/metadata/file-io.h
index fc7f9e1231b4b0fd41df143c8b887a0930ab22fc..564bca32711733eee1cd25bd7cde804a40d40740 100644 (file)
--- a/mono/metadata/file-io.h
+++ b/mono/metadata/file-io.h
@@ -238,9 +238,6 @@ ves_icall_System_IO_MonoIO_get_PathSeparator (void);
 extern MonoArray *
 ves_icall_System_IO_MonoIO_get_InvalidPathChars (void);
 
-extern gint32
-ves_icall_System_IO_MonoIO_GetTempPath (MonoString **mono_name);
-
 extern void ves_icall_System_IO_MonoIO_Lock (HANDLE handle, gint64 position,
                                             gint64 length, gint32 *error);
 extern void ves_icall_System_IO_MonoIO_Unlock (HANDLE handle, gint64 position,

diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h
index 429ce31f5f537a0d557e95c6196059aa9b1e57fb..d84494b65cb12d895a4d53bdad99baa843a0a78e 100644 (file)
--- a/mono/metadata/icall-def.h
+++ b/mono/metadata/icall-def.h
@@ -338,7 +338,6 @@ ICALL(MONOIO_10, "GetFileSystemEntries", ves_icall_System_IO_MonoIO_GetFileSyste
 ICALL(MONOIO_11, "GetFileType(intptr,System.IO.MonoIOError&)", ves_icall_System_IO_MonoIO_GetFileType)
 ICALL(MONOIO_12, "GetLength(intptr,System.IO.MonoIOError&)", ves_icall_System_IO_MonoIO_GetLength)
 #ifndef PLATFORM_RO_FS
-ICALL(MONOIO_13, "GetTempPath(string&)", ves_icall_System_IO_MonoIO_GetTempPath)
 ICALL(MONOIO_14, "Lock(intptr,long,long,System.IO.MonoIOError&)", ves_icall_System_IO_MonoIO_Lock)
 ICALL(MONOIO_15, "MoveFile(string,string,System.IO.MonoIOError&)", ves_icall_System_IO_MonoIO_MoveFile)
 #endif /* !PLATFORM_RO_FS */