firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 21:23:03 +01:00
Code Issues

Code cleanup

Browse Source
This commit is contained in:
alexpeshkoff 2003-04-06 09:08:58 +00:00
parent 455b87e620
commit ec88146136
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/config/dir_list.h
View File

@ -62,7 +62,7 @@ private:
protected:
// Used for various configuration parameters -
// returns parameter string from Config Manager.
virtual const Firebird::string GetConfigString(void) = 0;
virtual const Firebird::string GetConfigString(void) const = 0;
public:
DirectoryList();
~DirectoryList();

7
src/jrd/ext.cpp
View File

@ -60,12 +60,11 @@
static IB_FILE *ext_fopen(const char *filename, const char *mode);
class ExternalFilesDirectoryList : public DirectoryList {
virtual const Firebird::string GetConfigString(void) {
static class ExternalFilesDirectoryList : public DirectoryList {
const Firebird::string GetConfigString(void) const {
return Firebird::string(Config::getExternalTablesDirs());
}
};
static ExternalFilesDirectoryList iExternalFilesDirectoryList;
} iExternalFilesDirectoryList;
static IB_FILE *ext_fopen(const char *filename, const char *mode) {
if (!iExternalFilesDirectoryList.IsPathInList(filename))

2
src/jrd/isc_file.cpp
View File

@ -1742,7 +1742,7 @@ static void share_name_from_unc(
bool ISC_verify_databases_dirs(TEXT *name) {
#ifndef SUPERCLIENT
static class DatabasesDirectoryList : public DirectoryList {
virtual const Firebird::string GetConfigString(void) {
const Firebird::string GetConfigString(void) const {
return Firebird::string(Config::getDatabasesDirs());
}
} iDatabasesDirectoryList;

5
src/jrd/jrd.cpp
View File

@ -742,8 +742,9 @@ STATUS DLL_EXPORT GDS_ATTACH_DATABASE(STATUS* user_status,
/* Check to see if the database is truly local or if it just looks
that way */
if (ISC_check_if_remote(expanded_filename, TRUE))
if (ISC_check_if_remote(expanded_filename, TRUE)) {
ERR_post(gds_unavailable, 0);
}
}
/* Worry about encryption key */
@ -1880,7 +1881,7 @@ STATUS DLL_EXPORT GDS_CREATE_DATABASE(STATUS* user_status,
/* Check to see if the database is truly local or if it just looks
that way */
if (ISC_check_if_remote (expanded_filename, TRUE)) {
if (ISC_check_if_remote(expanded_filename, TRUE)) {
ERR_post(gds_unavailable, 0);
}
}