hyzboy/CMCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use FileAccess instead of FileInputStream/FileOutputStream

Browse Source
This commit is contained in:
hyzboy 2024-03-09 20:58:30 +08:00
parent 924f4ab9f3
commit 15baf1ecbd
No known key found for this signature in database
GPG Key ID: 067EE4525D4FB6D3
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/FileSystem/FileSystem.cpp
View File

@ -1,7 +1,6 @@
#include <hgl/filesystem/FileSystem.h> #include <hgl/filesystem/FileSystem.h>
#include <hgl/log/LogInfo.h> #include <hgl/log/LogInfo.h>
#include <hgl/io/FileInputStream.h> #include <hgl/io/FileAccess.h>
#include <hgl/io/FileOutputStream.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -89,11 +88,11 @@ namespace hgl
*/ */
bool FileComp(const OSString &filename1,const OSString &filename2,const size_t buf_size) bool FileComp(const OSString &filename1,const OSString &filename2,const size_t buf_size)
{ {
io::FileInputStream fp1,fp2; io::FileAccess fp1,fp2;
int64 fs1,fs2; int64 fs1,fs2;
if(!fp1.Open(filename1))return(false); if(!fp1.OpenRead(filename1))return(false);
if(!fp2.Open(filename2))return(false); if(!fp2.OpenRead(filename2))return(false);
fs1=fp1.GetSize(); fs1=fp1.GetSize();
fs2=fp2.GetSize(); fs2=fp2.GetSize();
@ -124,16 +123,16 @@ namespace hgl
void *LoadFileToMemory(const OSString &filename,int64 &size,bool append_zero) void *LoadFileToMemory(const OSString &filename,int64 &size,bool append_zero)
{ {
io::FileInputStream fs; io::FileAccess fa;
if(!fs.Open(filename)) if(!fa.OpenRead(filename))
return(nullptr); return(nullptr);
size=fs.GetSize(); size=fa.GetSize();
char *fb=new char[append_zero?size+1:size]; char *fb=new char[append_zero?size+1:size];
if(fs.Read(fb,size)==size) if(fa.Read(fb,size)==size)
{ {
if(append_zero) if(append_zero)
fb[size]=0; fb[size]=0;
@ -170,7 +169,7 @@ namespace hgl
*/ */
int64 SaveMemoryToFile(const OSString &filename,const void *buf,const int64 &size) int64 SaveMemoryToFile(const OSString &filename,const void *buf,const int64 &size)
{ {
io::FileOutputStream fs; io::FileAccess fs;
if(!fs.CreateTrunc(filename)) if(!fs.CreateTrunc(filename))
return(-1); return(-1);
@ -189,7 +188,7 @@ namespace hgl
*/ */
int64 SaveMemoryToFile(const OSString &filename,void **buf_list,const int64 *buf_size,const int &buf_count) int64 SaveMemoryToFile(const OSString &filename,void **buf_list,const int64 *buf_size,const int &buf_count)
{ {
io::FileOutputStream fs; io::FileAccess fs;
if(!fs.CreateTrunc(filename)) if(!fs.CreateTrunc(filename))
return(-1); return(-1);
@ -291,9 +290,9 @@ namespace hgl
if(!filename||!*filename||length==0) if(!filename||!*filename||length==0)
return(nullptr); return(nullptr);
io::FileInputStream fs; io::FileAccess fs;
if(!fs.Open(filename)) if(!fs.OpenRead(filename))
return(nullptr); return(nullptr);
const int64 file_length=fs.GetSize(); const int64 file_length=fs.GetSize();
@ -336,9 +335,9 @@ namespace hgl
*/ */
bool SaveMemoryToFile(const OSString &filename,int64 offset,const void *data,int64 length) bool SaveMemoryToFile(const OSString &filename,int64 offset,const void *data,int64 length)
{ {
io::FileOutputStream fs; io::FileAccess fs;
if(!fs.Open(filename)) if(!fs.CreateTrunc(filename))
return(false); return(false);
return fs.Write(offset,data,length); return fs.Write(offset,data,length);