mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 04:03:03 +01:00
Style and deleting extra, unnecessary scope block.
This commit is contained in:
parent
2c3c9878cb
commit
78ceba6473
@ -108,7 +108,7 @@ namespace {
|
||||
|
||||
class RecMutexHolder {
|
||||
public:
|
||||
RecMutexHolder(dsql_req* request) {
|
||||
explicit RecMutexHolder(dsql_req* request) {
|
||||
DsqlCheckout dcoHolder(request->req_dbb);
|
||||
rec_mutex->enter();
|
||||
}
|
||||
@ -119,7 +119,7 @@ namespace {
|
||||
#else
|
||||
class RecMutexHolder {
|
||||
public:
|
||||
RecMutexHolder(dsql_req* request) { }
|
||||
explicit RecMutexHolder(dsql_req* request) { }
|
||||
~RecMutexHolder() { }
|
||||
};
|
||||
#endif
|
||||
@ -819,14 +819,12 @@ USHORT METD_get_domain_default(dsql_req* request,
|
||||
*has_default = false;
|
||||
|
||||
if (*has_default) {
|
||||
ISC_STATUS stat;
|
||||
isc_blob_handle blob_handle;
|
||||
ISC_STATUS stat = 0;
|
||||
isc_blob_handle blob_handle = 0;
|
||||
|
||||
{ // scope
|
||||
DsqlCheckout dcoHolder(request->req_dbb);
|
||||
|
||||
// open the blob
|
||||
blob_handle = 0;
|
||||
stat = isc_open_blob2(status_vect, &DB, &request->req_trans,
|
||||
&blob_handle, blob_id, sizeof(blr_bpb),
|
||||
blr_bpb);
|
||||
@ -837,7 +835,7 @@ USHORT METD_get_domain_default(dsql_req* request,
|
||||
// fetch segments. Assume buffer is big enough.
|
||||
TEXT* ptr_in_buffer = buffer;
|
||||
while (true) {
|
||||
USHORT length;
|
||||
USHORT length = 0;
|
||||
|
||||
{ // scope
|
||||
DsqlCheckout dcoHolder(request->req_dbb);
|
||||
@ -1775,7 +1773,6 @@ dsql_rel* METD_get_view_base(dsql_req* request,
|
||||
|
||||
while (cont)
|
||||
{
|
||||
{ // scope
|
||||
DsqlCheckout dcoHolder(request->req_dbb);
|
||||
|
||||
FOR(REQUEST_HANDLE dbb->dbb_requests[irq_view_base]
|
||||
@ -1875,7 +1872,6 @@ dsql_rel* METD_get_view_base(dsql_req* request,
|
||||
ERRD_punt(isc_status);
|
||||
END_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
if (!relation)
|
||||
fields.clear();
|
||||
|
Loading…
Reference in New Issue
Block a user