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

Be consistent in usage of FB_DEFAULT_INSTANCE.

Browse Source
This commit is contained in:
paul_reeves 2007-07-26 09:58:32 +00:00
parent 4ad63828ba
commit d1f5482882
8 changed files with 254 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/iscguard/iscguard.cpp
View File

@ -122,7 +122,7 @@ int WINAPI WinMain(
service_flag = (OsVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
if (service_flag) {
strcpy(instance, DEFAULT_INSTANCE);
strcpy(instance, FB_DEFAULT_INSTANCE);
service_flag = parse_args(lpszCmdLine, instance);
MemoryPool& pool = *getDefaultMemoryPool();
service_name = FB_NEW(pool) Firebird::string(pool);

1
src/jrd/os/win32/config_root.cpp
View File

@ -29,6 +29,7 @@
#include "../jrd/os/config_root.h"
#include "../utilities/install/registry.h"
#include "../utilities/install/install_nt.h"
typedef Firebird::PathName string;

2
src/remote/os/win32/srvr_w32.cpp
View File

@ -206,7 +206,7 @@ int WINAPI WinMain(HINSTANCE hThisInst,
protocol_inet[0] = 0;
protocol_wnet[0] = 0;
strcpy(instance, DEFAULT_INSTANCE);
strcpy(instance, FB_DEFAULT_INSTANCE);
HANDLE connection_handle = parse_args(lpszArgs, &server_flag);

2
src/utilities/fbcpl/fbdialog.cpp
View File

@ -287,7 +287,7 @@ bool CFBDialog::ValidateInstalledServices()
CString CFBDialog::GetServiceName(const char* name) const
{
CString serviceName;
serviceName.Format(name, DEFAULT_INSTANCE);
serviceName.Format(name, FB_DEFAULT_INSTANCE);
return serviceName;
}

2
src/utilities/install/install_nt.h
View File

@ -37,7 +37,7 @@ static const char* ISCGUARD_EXECUTABLE = "bin\\fbguard";
static const char* GUARDIAN_MUTEX = "FirebirdGuardianMutex%s";
static const char* DEFAULT_INSTANCE = "DefaultInstance";
static const char* FB_DEFAULT_INSTANCE = "DefaultInstance";
// Starting with 128 the service params are user defined
const DWORD SERVICE_CREATE_GUARDIAN_MUTEX = 128;

2
src/utilities/install/install_svc.cpp
View File

@ -74,7 +74,7 @@ int CLIB_ROUTINE main( int argc, char **argv)
USHORT sw_arch = ARCH_SS;
bool sw_interactive = false;
const TEXT *instance = DEFAULT_INSTANCE;
const TEXT *instance = FB_DEFAULT_INSTANCE;
TEXT *username = 0;
TEXT *password = 0;

2
src/utilities/install/registry.cpp
View File

@ -122,7 +122,7 @@ USHORT REGISTRY_remove(HKEY hkey_rootnode,
return (*err_handler) (status, "RegOpenKeyEx", NULL);
}
// Remove the DEFAULT_INSTANCE value
// Remove the FB_DEFAULT_INSTANCE value
if ((status = RegDeleteValue(hkey_instances, FB_DEFAULT_INSTANCE))
!= ERROR_SUCCESS)
{

1
src/utilities/install/registry.h
View File

@ -28,7 +28,6 @@
static const char* REG_KEY_ROOT_COMPANY = "SOFTWARE\\Firebird Project";
static const char* REG_KEY_ROOT_PRODUCT = "SOFTWARE\\Firebird Project\\Firebird Server";
static const char* REG_KEY_ROOT_INSTANCES = "SOFTWARE\\Firebird Project\\Firebird Server\\Instances";
static const char* FB_DEFAULT_INSTANCE = "DefaultInstance";
#endif // REGISTRY_DEFINES_H