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

Changed sw_use to sw_no_reserve and ua_use to ua_no_reserve to distinguish them from sw_user and ua_user. Also, the new name is clearer on the intended usage.

Browse Source 
Disabled the replay log feature since Adriano deleted it in the server.
Also god rid of expand_filename() that was a B.O. function.
This commit is contained in:
robocop 2008-04-21 11:37:23 +00:00
parent a658ce64a5
commit 8ccc9eb5a6
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/alice/alice.cpp
View File

@ -85,7 +85,6 @@ void ALICE_exit(int code, AliceGlobals* tdgbl)
Firebird::LongJump::raise();
}
static void expand_filename(const TEXT*, TEXT*);
static void alice_output(const SCHAR*, ...) ATTRIBUTE_FORMAT(1,2);
@ -258,12 +257,16 @@ int alice(Firebird::UtilSvc* uSvc)
}
}
#ifdef DEV_BUILD
/*
if (table->in_sw_value & sw_begin_log) {
if (--argc <= 0) {
ALICE_error(5); // msg 5: replay log pathname required
}
expand_filename(*argv++, tdgbl->ALICE_data.ua_log_file);
fb_utils::copy_terminate(tdgbl->ALICE_data.ua_log_file, *argv++, sizeof(tdgbl->ALICE_data.ua_log_file));
}
*/
#endif
if (table->in_sw_value & (sw_buffers)) {
if (--argc <= 0) {
@ -348,16 +351,16 @@ int alice(Firebird::UtilSvc* uSvc)
}
}
if (table->in_sw_value & sw_use) {
if (table->in_sw_value & sw_no_reserve) {
if (--argc <= 0) {
ALICE_error(12); // msg 12: "full" or "reserve" required
}
ALICE_down_case(*argv++, string, sizeof(string));
if (!strcmp(string, "full")) {
tdgbl->ALICE_data.ua_use = true;
tdgbl->ALICE_data.ua_no_reserve = true;
}
else if (!strcmp(string, "reserve")) {
tdgbl->ALICE_data.ua_use = false;
tdgbl->ALICE_data.ua_no_reserve = false;
}
else {
ALICE_error(12); // msg 12: "full" or "reserve" required
@ -649,15 +652,3 @@ static void alice_output(const SCHAR* format, ...)
tdgbl->uSvc->output(buf.c_str());
}
//____________________________________________________________
//
// Fully expand a file name. If the file doesn't exist, do something
// intelligent.
// CVC: The above comment is either a joke or a copy/paste.
static void expand_filename(const TEXT* filename, TEXT* expanded_name)
{
strcpy(expanded_name, filename);
}