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

Misc.

Browse Source
This commit is contained in:
robocop 2008-04-06 10:31:58 +00:00
parent 53df74e2c9
commit 5e282b9f7e
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/tra.h
View File

@ -127,7 +127,7 @@ public:
gargage-collected by this tx */
jrd_tra* tra_next; /* next transaction in database */
jrd_tra* tra_sibling; /* next transaction in group */
MemoryPool* tra_pool; /* pool for transaction */
MemoryPool* const tra_pool; /* pool for transaction */
BlobIndexTree tra_blobs_tree; // list of active blobs
BlobIndexTree* tra_blobs; // pointer to actual list of active blobs
ArrayField* tra_arrays; /* Linked list of active arrays */
@ -152,7 +152,7 @@ public:
DatabaseSnapshot* tra_db_snapshot; // Database state snapshot (for monitoring purposes)
RuntimeStatistics tra_stats;
Firebird::Array<dsql_req*> tra_open_cursors;
jrd_tra* tra_outer; // outer transaction of an autonomous transaction
jrd_tra* const tra_outer; // outer transaction of an autonomous transaction
private:
TempSpace* tra_temp_space; // temp space storage

13
src/utilities/gsec/gsec.cpp
View File

@ -499,10 +499,6 @@ static bool get_switches(
* interesting switches in a switch table.
*
**************************************/
TEXT msg[MSG_LENGTH];
int l;
char quote;
SSHORT err_msg_no;
/* look at each argument. it's either a switch or a parameter.
parameters must always follow a switch, but not all switches
@ -521,6 +517,8 @@ static bool get_switches(
else if (*string != '-') {
/* this is not a switch, so it must be a parameter for
the previous switch, if any */
char quote;
int l;
switch (last_sw) {
case IN_SW_GSEC_ADD:
@ -632,8 +630,7 @@ static bool get_switches(
/* compare switch to switch name in table */
l = 0;
while (*p) {
for(int l = 0; *p; ++l) {
if (!*++p) {
if (l >= in_sw_tab->in_sw_min_length)
in_sw = in_sw_tab->in_sw;
@ -642,7 +639,6 @@ static bool get_switches(
}
if (UPPER(*p) != *q++)
break;
l++;
}
/* end of input means we got a match. stop looking */
@ -658,6 +654,8 @@ static bool get_switches(
and the applicable parameter value is set to its null value, in
case the user really wants to remove an existing parameter. */
SSHORT err_msg_no;
switch (in_sw) {
case IN_SW_GSEC_ADD:
case IN_SW_GSEC_DEL:
@ -829,6 +827,7 @@ static bool get_switches(
break;
case IN_SW_GSEC_Z:
if (!tdsec->tsec_sw_version) {
TEXT msg[MSG_LENGTH];
msg_get(GsecMsg39, msg);
util_output("%s %s\n", msg, GDS_VERSION);
}