You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2009/05/06 14:01:38 UTC

svn commit: r772163 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/file.c

Author: tellison
Date: Wed May  6 12:01:34 2009
New Revision: 772163

URL: http://svn.apache.org/viewvc?rev=772163&view=rev
Log:
Apply fix HARMONY-6186 ([classlib][luni] - ioh_convertToPlatform is not necessary to be invoked in hyfile.c)

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/file.c

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/file.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/file.c?rev=772163&r1=772162&r2=772163&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/file.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/file.c Wed May  6 12:01:34 2009
@@ -36,7 +36,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = hyfile_unlink (pathCopy);
   return result == 0;
 }
@@ -54,7 +53,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = hyfile_unlinkdir (pathCopy);
   return result == 0;
 }
@@ -93,7 +91,6 @@
       length++;
     }
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   findhandle = hyfile_findfirst (pathCopy, filename);
   if (findhandle == (UDATA) - 1)
     return NULL;
@@ -169,7 +166,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = hyfile_attr (pathCopy);
   return result == HyIsDir;
 }
@@ -187,7 +183,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = hyfile_attr (pathCopy);
   return result >= 0;
 }
@@ -205,7 +200,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = hyfile_attr (pathCopy);
   return result == HyIsFile;
 }
@@ -224,7 +218,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = hyfile_lastmod (pathCopy);
   return result;
 }
@@ -243,7 +236,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = hyfile_length (pathCopy);
   if (result < 0)
     {
@@ -295,7 +287,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = hyfile_mkdir (pathCopy);
   return result == 0;
 }
@@ -322,8 +313,6 @@
   }
   ((*env)->GetByteArrayRegion (env, pathNew, 0, length, (jbyte *)pathNewCopy));
   pathNewCopy[length] = '\0';
-  ioh_convertToPlatform (pathExistCopy);
-  ioh_convertToPlatform (pathNewCopy);
   result = hyfile_move (pathExistCopy, pathNewCopy);
   return result == 0;
 }
@@ -344,7 +333,6 @@
   }
   (*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy);
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
 #if defined(WIN32)
   platformCanonicalPath (pathCopy);
 #endif
@@ -368,7 +356,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
 
   /* Now create the file and close it */
   portFD = hyfile_open (pathCopy,
@@ -439,7 +426,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = getPlatformIsHidden (env, pathCopy);
   return result;
 }
@@ -457,7 +443,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
 
   result = setPlatformLastModified (env, pathCopy, (I_64) time);
 
@@ -476,7 +461,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   return setPlatformReadOnly (env, pathCopy);
 }
 
@@ -511,7 +495,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = getPlatformIsReadOnly (env, pathCopy);
   return result;
 }
@@ -529,7 +512,6 @@
   }
   ((*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy));
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   result = getPlatformIsWriteOnly (env, pathCopy);
   return result;
 }
@@ -547,7 +529,6 @@
   }
   (*env)->GetByteArrayRegion (env, path, 0, length, (jbyte *)pathCopy);
   pathCopy[length] = '\0';
-  ioh_convertToPlatform (pathCopy);
   if (platformReadLink (pathCopy))
     {
       answerlen = strlen (pathCopy);