hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2483: Return std::unique_ptr from SSLContext::create

Browse Source 
Smart pointers are far nicer than raw pointers.
This commit is contained in:
Markus Mäkelä
2019-05-21 09:12:25 +03:00
parent 5b55864b06
commit 4e2d350838
10 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/server.cc
View File

@ -195,7 +195,7 @@ Server* Server::server_alloc(const char* name, const MXS_CONFIG_PARAMETER& param
return NULL;
}
mxs::SSLContext* ssl = NULL;
std::unique_ptr<mxs::SSLContext> ssl;
if (!config_create_ssl(name, params, false, &ssl))
{
@ -203,14 +203,13 @@ Server* Server::server_alloc(const char* name, const MXS_CONFIG_PARAMETER& param
return NULL;
}
Server* server = new(std::nothrow) Server(name, protocol, authenticator, ssl);
Server* server = new(std::nothrow) Server(name, protocol, authenticator, std::move(ssl));
DCB** persistent = (DCB**)MXS_CALLOC(config_threadcount(), sizeof(*persistent));
if (!server || !persistent)
{
delete server;
MXS_FREE(persistent);
delete ssl;
return NULL;
}