Author: mturk
Date: Fri Oct 2 11:24:32 2009
New Revision: 820969
URL: http://svn.apache.org/viewvc?rev=820969&view=rev
Log:
Rename FileSystem to FileWrapper and make it private. Pipe and Socket will also
have Wrapper classes
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java
- copied, changed from r820923,
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystem.java
Removed:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystem.java
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java
commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c
commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c
Copied:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java
(from r820923,
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystem.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystem.java&r1=820923&r2=820969&rev=820969&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystem.java
(original)
+++
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java
Fri Oct 2 11:24:32 2009
@@ -22,16 +22,16 @@
import java.util.EnumSet;
/**
- * File system provider class.
+ * File wrappe class.
* <p>
- * Apache Commons Runtime {...@code FileSystem} provides static
+ * Apache Commons Runtime {...@code FileWrapper} provides static
* method API for native file portable layer.
* </p>
*/
-public final class FileSystem
+class FileWrapper
{
- protected FileSystem()
+ protected FileWrapper()
{
// Nothing.
}
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java?rev=820969&r1=820968&r2=820969&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java
(original)
+++
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java
Fri Oct 2 11:24:32 2009
@@ -76,7 +76,7 @@
private static native Descriptor create1(int fd, int flags)
throws IOException, SecurityException, OutOfMemoryError;
/**
- * Create new MemoryMapPrivider from the esisting filr {...@code
Descriptor}.
+ * Create new MemoryMapPrivider from the esisting file {...@code
Descriptor}.
* <p>
* </p>
* @param fd Valid file descriptor.
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c?rev=820969&r1=820968&r2=820969&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c Fri Oct 2
11:24:32 2009
@@ -265,9 +265,9 @@
return rc;
}
-ACR_IO_EXPORT_DECLARE(jobject, FileSystem, open0)(ACR_JNISTDARGS,
- jstring fname,
- jint flags)
+ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open0)(ACR_JNISTDARGS,
+ jstring fname,
+ jint flags)
{
int rc = 0;
jobject fdo = NULL;
@@ -284,10 +284,10 @@
return fdo;
}
-ACR_IO_EXPORT_DECLARE(jobject, FileSystem, open1)(ACR_JNISTDARGS,
- jstring fname,
- jint flags,
- jint prot)
+ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open1)(ACR_JNISTDARGS,
+ jstring fname,
+ jint flags,
+ jint prot)
{
int rc = 0;
jobject fdo = NULL;
@@ -304,9 +304,9 @@
return fdo;
}
-ACR_IO_EXPORT_DECLARE(jobject, FileSystem, open2)(ACR_JNISTDARGS,
- jint which,
- jint flags)
+ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open2)(ACR_JNISTDARGS,
+ jint which,
+ jint flags)
{
int rc = 0;
int fd = -1;
@@ -399,9 +399,9 @@
return errno;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, lock0)(ACR_JNISTDARGS,
- jint file,
- jint type)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, lock0)(ACR_JNISTDARGS,
+ jint file,
+ jint type)
{
int rc;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -464,11 +464,11 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, lock1)(ACR_JNISTDARGS,
- jint file,
- jint type,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, lock1)(ACR_JNISTDARGS,
+ jint file,
+ jint type,
+ jlong off,
+ jlong len)
{
int rc;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -531,8 +531,8 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, unlock0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, unlock0)(ACR_JNISTDARGS,
+ jint file)
{
int rc;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -574,10 +574,10 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, unlock1)(ACR_JNISTDARGS,
- jint file,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, unlock1)(ACR_JNISTDARGS,
+ jint file,
+ jlong off,
+ jlong len)
{
int rc;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -619,10 +619,10 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jlong, FileSystem, seek0)(ACR_JNISTDARGS,
- jint file,
- jint where,
- jlong off)
+ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, seek0)(ACR_JNISTDARGS,
+ jint file,
+ jint where,
+ jlong off)
{
acr_off_t rc;
acr_off_t os = (acr_off_t)off;
@@ -659,9 +659,9 @@
return (jlong)rc;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, trunc0)(ACR_JNISTDARGS,
- jint file,
- jlong off)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, trunc0)(ACR_JNISTDARGS,
+ jint file,
+ jlong off)
{
acr_off_t os = (acr_off_t)off;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -678,8 +678,8 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, read0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read0)(ACR_JNISTDARGS,
+ jint file)
{
unsigned char c;
ssize_t rd;
@@ -732,11 +732,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, read1)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read1)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb = NULL;
jbyte *bc = NULL;
@@ -822,11 +822,11 @@
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, read2)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read2)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
size_t po = (size_t)off;
@@ -889,11 +889,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, read3)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read3)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jlong off,
+ jlong len)
{
#if defined(_DEBUG)
size_t pl;
@@ -961,9 +961,9 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write0)(ACR_JNISTDARGS,
- jint file,
- jint b)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write0)(ACR_JNISTDARGS,
+ jint file,
+ jint b)
{
unsigned char c = (unsigned char)(b & 0xFF);
ssize_t wr;
@@ -1009,11 +1009,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write1)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write1)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb;
size_t po = (size_t)off;
@@ -1067,11 +1067,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write2)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write2)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
size_t po = (size_t)off;
@@ -1129,11 +1129,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write3)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write3)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jlong off,
+ jlong len)
{
#if defined(_DEBUG)
size_t pl;
@@ -1197,11 +1197,11 @@
}
#define ACR_IOVEC_ON_STACK 32
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write4)(ACR_JNISTDARGS,
- jint file,
- jobjectArray vec,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write4)(ACR_JNISTDARGS,
+ jint file,
+ jobjectArray vec,
+ jint off,
+ jint len)
{
size_t i;
size_t pl;
@@ -1292,11 +1292,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write5)(ACR_JNISTDARGS,
- jint file,
- jobjectArray vec,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write5)(ACR_JNISTDARGS,
+ jint file,
+ jobjectArray vec,
+ jint off,
+ jint len)
{
size_t i;
size_t pl;
@@ -1371,11 +1371,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, fullw0)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw0)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb;
jbyte *wb;
@@ -1439,11 +1439,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, fullw1)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw1)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
size_t po = (size_t)off;
@@ -1511,11 +1511,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, fullw2)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw2)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jlong off,
+ jlong len)
{
#if defined(_DEBUG)
size_t pl;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c?rev=820969&r1=820968&r2=820969&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c Fri Oct 2
11:24:32 2009
@@ -319,9 +319,9 @@
return rc;
}
-ACR_IO_EXPORT_DECLARE(jobject, FileSystem, open0)(ACR_JNISTDARGS,
- jstring fname,
- jint flags)
+ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open0)(ACR_JNISTDARGS,
+ jstring fname,
+ jint flags)
{
int rc = 0;
jobject fdo = NULL;
@@ -338,10 +338,10 @@
return fdo;
}
-ACR_IO_EXPORT_DECLARE(jobject, FileSystem, open1)(ACR_JNISTDARGS,
- jstring fname,
- jint flags,
- jint prot)
+ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open1)(ACR_JNISTDARGS,
+ jstring fname,
+ jint flags,
+ jint prot)
{
int rc = 0;
jobject fdo = NULL;
@@ -358,9 +358,9 @@
return fdo;
}
-ACR_IO_EXPORT_DECLARE(jobject, FileSystem, open2)(ACR_JNISTDARGS,
- jint which,
- jint flags)
+ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open2)(ACR_JNISTDARGS,
+ jint which,
+ jint flags)
{
DWORD rc = 0;
HANDLE fd = INVALID_HANDLE_VALUE;
@@ -491,9 +491,9 @@
return rc;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, lock0)(ACR_JNISTDARGS,
- jint file,
- jint type)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, lock0)(ACR_JNISTDARGS,
+ jint file,
+ jint type)
{
DWORD flags = 0;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -511,11 +511,11 @@
return do_lock(f, flags);
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, lock1)(ACR_JNISTDARGS,
- jint file,
- jint type,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, lock1)(ACR_JNISTDARGS,
+ jint file,
+ jint type,
+ jlong off,
+ jlong len)
{
LARGE_INTEGER lii;
DWORD flags = 0;
@@ -578,8 +578,8 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, unlock0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, unlock0)(ACR_JNISTDARGS,
+ jint file)
{
OVERLAPPED opp;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -596,10 +596,10 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, unlock1)(ACR_JNISTDARGS,
- jint file,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, unlock1)(ACR_JNISTDARGS,
+ jint file,
+ jlong off,
+ jlong len)
{
LARGE_INTEGER lii;
OVERLAPPED opp;
@@ -620,10 +620,10 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jlong, FileSystem, seek0)(ACR_JNISTDARGS,
- jint file,
- jint where,
- jlong off)
+ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, seek0)(ACR_JNISTDARGS,
+ jint file,
+ jint where,
+ jlong off)
{
LARGE_INTEGER os;
LARGE_INTEGER op;
@@ -663,9 +663,9 @@
return (jlong)f->pos;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, trunc0)(ACR_JNISTDARGS,
- jint file,
- jlong off)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, trunc0)(ACR_JNISTDARGS,
+ jint file,
+ jlong off)
{
LARGE_INTEGER os;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -793,8 +793,8 @@
return rc;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, read0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read0)(ACR_JNISTDARGS,
+ jint file)
{
unsigned char c;
DWORD rd = 0;
@@ -903,11 +903,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, read1)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read1)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb = NULL;
jbyte *bc = NULL;
@@ -1059,11 +1059,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, read2)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read2)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
DWORD po = (DWORD)off;
@@ -1193,11 +1193,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, read3)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read3)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jlong off,
+ jlong len)
{
#if defined(_DEBUG)
DWORD pl;
@@ -1331,9 +1331,9 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write0)(ACR_JNISTDARGS,
- jint file,
- jint b)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write0)(ACR_JNISTDARGS,
+ jint file,
+ jint b)
{
unsigned char c = (unsigned char)(b & 0xFF);
DWORD rc = 0;
@@ -1434,11 +1434,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write1)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write1)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb;
DWORD rc = 0;
@@ -1550,11 +1550,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write2)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write2)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
jbyte *pb;
@@ -1672,11 +1672,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write3)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write3)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jlong off,
+ jlong len)
{
#if defined(_DEBUG)
DWORD pl;
@@ -1798,11 +1798,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write4)(ACR_JNISTDARGS,
- jint file,
- jobjectArray vec,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write4)(ACR_JNISTDARGS,
+ jint file,
+ jobjectArray vec,
+ jint off,
+ jint len)
{
DWORD i;
DWORD pl;
@@ -1927,11 +1927,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, write5)(ACR_JNISTDARGS,
- jint file,
- jobjectArray vec,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write5)(ACR_JNISTDARGS,
+ jint file,
+ jobjectArray vec,
+ jint off,
+ jint len)
{
DWORD i;
DWORD pl;
@@ -2057,11 +2057,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, fullw0)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw0)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb;
jbyte *wb;
@@ -2186,11 +2186,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, fullw1)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw1)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
jbyte *pb;
@@ -2319,11 +2319,11 @@
return -1;
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, fullw2)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw2)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jlong off,
+ jlong len)
{
#if defined(_DEBUG)
DWORD pl;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c?rev=820969&r1=820968&r2=820969&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c Fri Oct 2
11:24:32 2009
@@ -24,8 +24,8 @@
#include "acr_fileio.h"
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, ftype0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, ftype0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -40,8 +40,8 @@
return f->type;
}
-ACR_IO_EXPORT_DECLARE(jboolean, FileSystem, eof0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jboolean, FileWrapper, eof0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -56,9 +56,9 @@
return V2Z(f->eof);
}
-ACR_IO_EXPORT_DECLARE(jint, FileSystem, tmset0)(ACR_JNISTDARGS,
- jint file,
- jlong timeout)
+ACR_IO_EXPORT_DECLARE(jint, FileWrapper, tmset0)(ACR_JNISTDARGS,
+ jint file,
+ jlong timeout)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -75,8 +75,8 @@
return 0;
}
-ACR_IO_EXPORT_DECLARE(jlong, FileSystem, tmget0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, tmget0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
