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

Comments.

Browse Source
This commit is contained in:
robocop 2009-11-25 09:16:52 +00:00
parent 4df10d8460
commit 1ea6640b82
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jrd/jrd.cpp
View File

@ -917,9 +917,9 @@ ISC_STATUS GDS_ATTACH_DATABASE(ISC_STATUS* user_status,
}
}
/* If database to be opened is security database, then only
gsec or SecurityDatabase may open it. This protects from use
of old gsec to write wrong password hashes into it. */
// If database to be opened is security database, then only
// gsec or SecurityDatabase may open it. This protects from use
// of old gsec to write wrong password hashes into it.
if (vdn == VDN_SECURITY && !options.dpb_gsec_attach && !options.dpb_sec_attach)
{
ERR_post(Arg::Gds(isc_no_priv) << Arg::Str("direct") <<
@ -1191,10 +1191,10 @@ ISC_STATUS GDS_ATTACH_DATABASE(ISC_STATUS* user_status,
}
#ifdef SUPERSERVER
/* Check if another attachment has or is requesting exclusive database access.
If this is an implicit attachment for the security (password) database, don't
try to get exclusive attachment to avoid a deadlock condition which happens
when a client tries to connect to the security database itself. */
// Check if another attachment has or is requesting exclusive database access.
// If this is an implicit attachment for the security (password) database, don't
// try to get exclusive attachment to avoid a deadlock condition which happens
// when a client tries to connect to the security database itself.
if (!options.dpb_sec_attach)
{
@ -1259,12 +1259,10 @@ ISC_STATUS GDS_ATTACH_DATABASE(ISC_STATUS* user_status,
find_intl_charset(tdbb, attachment, &options);
/*
* if the attachment is through gbak and this attachment is not by owner
* or sysdba then return error. This has been added here to allow for the
* GBAK security feature of only allowing the owner or sysdba to backup a
* database. smistry 10/5/98
*/
// if the attachment is through gbak and this attachment is not by owner
// or sysdba then return error. This has been added here to allow for the
// GBAK security feature of only allowing the owner or sysdba to backup a
// database. smistry 10/5/98
if ((attachment->att_flags & ATT_gbak_attachment) ||
(attachment->att_flags & ATT_gfix_attachment) ||

8
src/jrd/perf.cpp
View File

@ -72,7 +72,7 @@ static const SCHAR* report = "elapsed = !e cpu = !u reads = !r writes = !w fetch
#define TICK 100
#endif
/* EKU: TICK (sys/param.h) and CLOCKS_PER_SEC (time.h) may both be defined */
// EKU: TICK (sys/param.h) and CLOCKS_PER_SEC (time.h) may both be defined
#if !defined(TICK) && defined(CLOCKS_PER_SEC)
#define TICK ((SLONG)CLOCKS_PER_SEC)
#endif
@ -219,16 +219,16 @@ static void perf_get_info(FB_API_HANDLE* handle, P* perf)
struct timeval tp;
#else
struct timeb time_buffer;
#define LARGE_NUMBER 696600000 /* to avoid overflow, get rid of decades) */
#define LARGE_NUMBER 696600000 // to avoid overflow, get rid of decades)
#endif
/* If there isn't a database, zero everything out */
// If there isn't a database, zero everything out
if (!*handle) {
memset(perf, 0, sizeof(PERF));
}
/* Get system times */
// Get system time
times(&perf->perf_times);