asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed dir access return value, changed it to Error like all other funcs

Browse source
This commit is contained in:
Juan Linietsky 2017-01-14 09:16:41 -03:00
parent 7b9f2d9929
commit da4170540c
12 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/bind/core_bind.cpp
View file

@ -1830,9 +1830,9 @@ Error _Directory::open(const String& p_path) {
return OK; return OK;
} }
bool _Directory::list_dir_begin() { Error _Directory::list_dir_begin() {
ERR_FAIL_COND_V(!d,false); ERR_FAIL_COND_V(!d,ERR_UNCONFIGURED);
return d->list_dir_begin(); return d->list_dir_begin();
} }

2
core/bind/core_bind.h
View file

@ -456,7 +456,7 @@ public:
Error open(const String& p_path); Error open(const String& p_path);
bool list_dir_begin(); ///< This starts dir listing Error list_dir_begin(); ///< This starts dir listing
String get_next(); String get_next();
bool current_is_dir() const; bool current_is_dir() const;

4
core/io/file_access_pack.cpp
View file

@ -340,7 +340,7 @@ FileAccessPack::~FileAccessPack() {
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
bool DirAccessPack::list_dir_begin() { Error DirAccessPack::list_dir_begin() {
list_dirs.clear(); list_dirs.clear();
@ -356,7 +356,7 @@ bool DirAccessPack::list_dir_begin() {
list_files.push_back(E->get()); list_files.push_back(E->get());
} }
return true; return OK;
} }
String DirAccessPack::get_next(){ String DirAccessPack::get_next(){

2
core/io/file_access_pack.h
View file

@ -209,7 +209,7 @@ class DirAccessPack : public DirAccess {
public: public:
virtual bool list_dir_begin(); virtual Error list_dir_begin();
virtual String get_next(); virtual String get_next();
virtual bool current_is_dir() const; virtual bool current_is_dir() const;
virtual bool current_is_hidden() const; virtual bool current_is_hidden() const;

2
core/os/dir_access.h
View file

@ -72,7 +72,7 @@ protected:
public: public:
virtual bool list_dir_begin()=0; ///< This starts dir listing virtual Error list_dir_begin()=0; ///< This starts dir listing
virtual String get_next(bool* p_is_dir); // compatibility virtual String get_next(bool* p_is_dir); // compatibility
virtual String get_next()=0; virtual String get_next()=0;
virtual bool current_is_dir() const=0; virtual bool current_is_dir() const=0;

6
drivers/unix/dir_access_unix.cpp
View file

@ -44,7 +44,7 @@ DirAccess *DirAccessUnix::create_fs() {
return memnew( DirAccessUnix ); return memnew( DirAccessUnix );
} }
bool DirAccessUnix::list_dir_begin() { Error DirAccessUnix::list_dir_begin() {
list_dir_end(); //close any previous dir opening! list_dir_end(); //close any previous dir opening!
@ -55,9 +55,9 @@ bool DirAccessUnix::list_dir_begin() {
dir_stream = opendir(current_dir.utf8().get_data()); dir_stream = opendir(current_dir.utf8().get_data());
//chdir(real_current_dir_name); //chdir(real_current_dir_name);
if (!dir_stream) if (!dir_stream)
return true; //error! return ERR_CANT_OPEN; //error!
return false; return OK;
} }
bool DirAccessUnix::file_exists(String p_file) { bool DirAccessUnix::file_exists(String p_file) {

2
drivers/unix/dir_access_unix.h
View file

@ -57,7 +57,7 @@ protected:
public: public:
virtual bool list_dir_begin(); ///< This starts dir listing virtual Error list_dir_begin(); ///< This starts dir listing
virtual String get_next(); virtual String get_next();
virtual bool current_is_dir() const; virtual bool current_is_dir() const;
virtual bool current_is_hidden() const; virtual bool current_is_hidden() const;

4
drivers/windows/dir_access_windows.cpp
View file

@ -59,7 +59,7 @@ struct DirAccessWindowsPrivate {
// CreateFolderAsync // CreateFolderAsync
bool DirAccessWindows::list_dir_begin() { Error DirAccessWindows::list_dir_begin() {
_cisdir=false; _cisdir=false;
_cishidden=false; _cishidden=false;
@ -67,7 +67,7 @@ bool DirAccessWindows::list_dir_begin() {
list_dir_end(); list_dir_end();
p->h = FindFirstFileExW((current_dir+"\\*").c_str(), FindExInfoStandard, &p->fu, FindExSearchNameMatch, NULL, 0); p->h = FindFirstFileExW((current_dir+"\\*").c_str(), FindExInfoStandard, &p->fu, FindExSearchNameMatch, NULL, 0);
return (p->h==INVALID_HANDLE_VALUE); return (p->h==INVALID_HANDLE_VALUE) ? ERR_CANT_OPEN : OK;
} }

6
platform/android/dir_access_android.cpp
View file

@ -37,16 +37,16 @@ DirAccess *DirAccessAndroid::create_fs() {
return memnew(DirAccessAndroid); return memnew(DirAccessAndroid);
} }
bool DirAccessAndroid::list_dir_begin() { Error DirAccessAndroid::list_dir_begin() {
list_dir_end(); list_dir_end();
AAssetDir* aad = AAssetManager_openDir(FileAccessAndroid::asset_manager,current_dir.utf8().get_data()); AAssetDir* aad = AAssetManager_openDir(FileAccessAndroid::asset_manager,current_dir.utf8().get_data());
if (!aad) if (!aad)
return true; //nothing return ERR_CANT_OPEN; //nothing
return false; return OK;
} }
String DirAccessAndroid::get_next(){ String DirAccessAndroid::get_next(){

2
platform/android/dir_access_android.h
View file

@ -49,7 +49,7 @@ class DirAccessAndroid : public DirAccess {
public: public:
virtual bool list_dir_begin(); ///< This starts dir listing virtual Error list_dir_begin(); ///< This starts dir listing
virtual String get_next(); virtual String get_next();
virtual bool current_is_dir() const; virtual bool current_is_dir() const;
virtual bool current_is_hidden() const; virtual bool current_is_hidden() const;

6
platform/android/dir_access_jandroid.cpp
View file

@ -47,7 +47,7 @@ DirAccess *DirAccessJAndroid::create_fs() {
return memnew(DirAccessJAndroid); return memnew(DirAccessJAndroid);
} }
bool DirAccessJAndroid::list_dir_begin() { Error DirAccessJAndroid::list_dir_begin() {
list_dir_end(); list_dir_end();
JNIEnv *env = ThreadAndroid::get_env(); JNIEnv *env = ThreadAndroid::get_env();
@ -55,11 +55,11 @@ bool DirAccessJAndroid::list_dir_begin() {
jstring js = env->NewStringUTF(current_dir.utf8().get_data()); jstring js = env->NewStringUTF(current_dir.utf8().get_data());
int res = env->CallIntMethod(io,_dir_open,js); int res = env->CallIntMethod(io,_dir_open,js);
if (res<=0) if (res<=0)
return true; return ERR_CANT_OPEN;
id=res; id=res;
return false; return OK;
} }
String DirAccessJAndroid::get_next(){ String DirAccessJAndroid::get_next(){

2
platform/android/dir_access_jandroid.h
View file

@ -58,7 +58,7 @@ class DirAccessJAndroid : public DirAccess {
public: public:
virtual bool list_dir_begin(); ///< This starts dir listing virtual Error list_dir_begin(); ///< This starts dir listing
virtual String get_next(); virtual String get_next();
virtual bool current_is_dir() const; virtual bool current_is_dir() const;
virtual bool current_is_hidden() const; virtual bool current_is_hidden() const;