diff options
| -rw-r--r-- | vfs/UVFSCore.pas | 16 | ||||
| -rw-r--r-- | vfs/uVFSprototypes.pas | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/vfs/UVFSCore.pas b/vfs/UVFSCore.pas index a0ada8f..7b4a110 100644 --- a/vfs/UVFSCore.pas +++ b/vfs/UVFSCore.pas @@ -59,8 +59,8 @@ type FVFSCloseFile: TVFSCloseFile; FVFSFileSeek: TVFSFileSeek; FVFSSetBlockSize: TVFSSetBlockSize; - FVFSCopyOut: TVFSCopyOut; - FVFSCopyIn: TVFSCopyIn; + FVFSCopyToLocal: TVFSCopyToLocal; + FVFSCopyFromLocal: TVFSCopyFromLocal; FVFSIsOnSameFS: TVFSIsOnSameFS; FVFSTwoSameFiles: TVFSTwoSameFiles; FVFSGetArchiveExts: TVFSGetArchiveExts; @@ -226,8 +226,8 @@ begin @FVFSChangeTimes := dlsym(ModuleHandle, 'VFSChangeTimes'); @FVFSGetDirSize := dlsym(ModuleHandle, 'VFSGetDirSize'); @FVFSBreakGetDirSize := dlsym(ModuleHandle, 'VFSBreakGetDirSize'); - @FVFSCopyOut := dlsym(ModuleHandle, 'VFSCopyOut'); - @FVFSCopyIn := dlsym(ModuleHandle, 'VFSCopyIn'); + @FVFSCopyToLocal := dlsym(ModuleHandle, 'VFSCopyToLocal'); + @FVFSCopyFromLocal := dlsym(ModuleHandle, 'VFSCopyFromLocal'); @FVFSOpenFile := dlsym(ModuleHandle, 'VFSOpenFile'); @FVFSReadFile := dlsym(ModuleHandle, 'VFSReadFile'); @FVFSWriteFile := dlsym(ModuleHandle, 'VFSWriteFile'); @@ -960,13 +960,13 @@ var Res: TVFSResult; begin Result := False; try - if @FSourcePlugin.FVFSCopyOut <> nil then begin + if @FSourcePlugin.FVFSCopyToLocal <> nil then begin // DebugMsg(['0 $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$']); // DebugMsg([' Pointer(FGlobs) = 0x', IntToHex(Int64(FGlobs), 16), ', Pointer(@NewVFSCopyCallBackFunc) = 0x', IntToHex(Int64(@NewVFSCopyCallBackFunc), 16), ', Pointer(Self) = 0x', IntToHex(Int64(Self), 16)]); try if @FSourcePlugin.FVFSSetCallbacks <> nil then FSourcePlugin.FVFSSetCallbacks(FGlobs, AskQuestionCallback, AskPasswordCallback, ProgressCallback, CallbackData); - Res := FSourcePlugin.FVFSCopyOut(FGlobs, PChar(SourceFile), PChar(DestFile), Append); + Res := FSourcePlugin.FVFSCopyToLocal(FGlobs, PChar(SourceFile), PChar(DestFile), Append); if @FSourcePlugin.FVFSSetCallbacks <> nil then FSourcePlugin.FVFSSetCallbacks(FGlobs, nil, nil, nil, nil); except @@ -996,11 +996,11 @@ var Res: TVFSResult; begin Result := False; try - if @FSourcePlugin.FVFSCopyIn <> nil then begin + if @FSourcePlugin.FVFSCopyFromLocal <> nil then begin try if @FSourcePlugin.FVFSSetCallbacks <> nil then FSourcePlugin.FVFSSetCallbacks(FGlobs, AskQuestionCallback, AskPasswordCallback, ProgressCallback, CallbackData); - Res := FSourcePlugin.FVFSCopyIn(FGlobs, PChar(SourceFile), PChar(DestFile), Append); + Res := FSourcePlugin.FVFSCopyFromLocal(FGlobs, PChar(SourceFile), PChar(DestFile), Append); if @FSourcePlugin.FVFSSetCallbacks <> nil then FSourcePlugin.FVFSSetCallbacks(FGlobs, nil, nil, nil, nil); except diff --git a/vfs/uVFSprototypes.pas b/vfs/uVFSprototypes.pas index 2de5ec4..647f1c6 100644 --- a/vfs/uVFSprototypes.pas +++ b/vfs/uVFSprototypes.pas @@ -259,13 +259,13 @@ type // TODO: Runs the command read from inside the archive (typically installing the rpm package) - TVFSCopyOut = function (g:TVFSGlobs; const sSrcName, sDstName: PChar; Append: LongBool): TVFSResult; cdecl; + TVFSCopyToLocal = function (g:TVFSGlobs; const sSrcName, sDstName: PChar; Append: LongBool): TVFSResult; cdecl; // Performs the copy process from inside of module to the file in the local system // (thus sSrcName is a path from inside of module and sDstName is path in the local filesystem where the file should be copied) // The data pointer is then used to call the callback function in // Note: if you need to transfer a file between two VFS modules, you need to do it manually - either first copy to local FS or use the Open, Read, Write functions of the module (NOTE: both VFS modules have to support these functions) - TVFSCopyIn = function (g:TVFSGlobs; const sSrcName, sDstName: PChar; Append: LongBool): TVFSResult; cdecl; + TVFSCopyFromLocal = function (g:TVFSGlobs; const sSrcName, sDstName: PChar; Append: LongBool): TVFSResult; cdecl; // Performs the copy process from the local filesystem into the module |