mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 02:03:04 +01:00
Misc.
This commit is contained in:
parent
4a63dc6573
commit
f3ee441533
@ -4982,8 +4982,8 @@ ISC_STATUS rem_port::service_attach(const char* service_name,
|
||||
svc->svc_iface = iface;
|
||||
}
|
||||
|
||||
return this->send_response(sendL, 0, authenticated ? sendL->p_resp.p_resp_data.cstr_length : 0,
|
||||
&status_vector, false);
|
||||
return this->send_response(sendL, 0,
|
||||
(authenticated ? sendL->p_resp.p_resp_data.cstr_length : 0), &status_vector, false);
|
||||
}
|
||||
|
||||
|
||||
|
@ -465,7 +465,7 @@ private:
|
||||
unsigned int checkSpbLen;
|
||||
const unsigned char* checkSpbPresent;
|
||||
Firebird::HalfStaticArray<UCHAR, 256> authBlock;
|
||||
bool utf8Connection; // Client talks to us using UTF8, else - system default collation
|
||||
bool utf8Connection; // Client talks to us using UTF8, else - system default charset
|
||||
|
||||
void populateSpb(Firebird::ClumpletWriter& spb, UCHAR tag);
|
||||
};
|
||||
|
@ -2143,7 +2143,8 @@ int API_ROUTINE gds__thread_start(FPTR_INT_VOID_PTR entrypoint,
|
||||
}
|
||||
|
||||
// new utl
|
||||
static inline void setTag(Firebird::ClumpletWriter& dpb, UCHAR tag, Firebird::string& value, bool utf8)
|
||||
static inline void setTag(Firebird::ClumpletWriter& dpb, UCHAR tag,
|
||||
Firebird::string& value, bool utf8)
|
||||
{
|
||||
if (! dpb.find(tag))
|
||||
{
|
||||
|
@ -4786,6 +4786,7 @@ int YService::release()
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------
|
||||
|
||||
|
||||
@ -4941,7 +4942,10 @@ YService* Dispatcher::attachServiceManager(IStatus* status, const char* serviceN
|
||||
return new YService(provider, service, utfData);
|
||||
}
|
||||
else
|
||||
return new YService(svcName.c_str(), spbWriter.getBufferLength(), spbWriter.getBuffer(), utfData);
|
||||
{
|
||||
return new YService(svcName.c_str(), spbWriter.getBufferLength(),
|
||||
spbWriter.getBuffer(), utfData);
|
||||
}
|
||||
}
|
||||
catch (const Exception& e)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user