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

MXS-2020 Replace ss[_info]_dassert with mxb_assert[_message]

Browse Source
This commit is contained in:
Johan Wikman
2018-08-22 09:59:02 +03:00
parent b1e405442f
commit 3f53eddbde
161 changed files with 1640 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
View File

@ -298,7 +298,7 @@ static bool gssapi_auth_extract(DCB *dcb, GWBUF *read_buffer)
default:
MXS_ERROR("Unexpected authentication state: %d", auth->state);
ss_dassert(false);
mxb_assert(false);
break;
}
@ -419,7 +419,7 @@ static int auth_cb(void *data, int columns, char** rows, char** row_names)
*/
static bool validate_user(gssapi_auth_t *auth, DCB *dcb, MYSQL_session *session, const char *princ)
{
ss_dassert(princ);
mxb_assert(princ);
size_t len = sizeof(gssapi_auth_query) + strlen(session->user) * 2 +
strlen(session->db) * 2 + strlen(dcb->remote) + strlen(princ) * 2;
char sql[len + 1];
@ -635,7 +635,7 @@ int gssapi_auth_load_users(SERV_LISTENER *listener)
if (res)
{
ss_dassert(mysql_num_fields(res) == GSSAPI_USERS_QUERY_NUM_FIELDS);
mxb_assert(mysql_num_fields(res) == GSSAPI_USERS_QUERY_NUM_FIELDS);
MYSQL_ROW row;
while ((row = mysql_fetch_row(res)))

4
server/modules/authenticator/MySQLAuth/mysql_auth.cc
View File

@ -144,12 +144,12 @@ static bool open_instance_database(const char *path, sqlite3 **handle)
sqlite3* get_handle(MYSQL_AUTH* instance)
{
int i = mxs_rworker_get_current_id();
ss_dassert(i >= 0);
mxb_assert(i >= 0);
if (instance->handles[i] == NULL)
{
MXB_AT_DEBUG(bool rval = )open_instance_database(":memory:", &instance->handles[i]);
ss_dassert(rval);
mxb_assert(rval);
}
return instance->handles[i];

2
server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc
View File

@ -100,7 +100,7 @@ static bool auth_backend_extract(DCB *dcb, GWBUF *buf)
default:
MXS_ERROR("Unexpected call to MySQLBackendAuth::extract");
ss_dassert(false);
mxb_assert(false);
break;
}

4
server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc
View File

@ -61,7 +61,7 @@ bool store_client_password(DCB *dcb, GWBUF *buffer)
*/
int user_services_cb(void *data, int columns, char** column_vals, char** column_names)
{
ss_dassert(columns == 1);
mxb_assert(columns == 1);
PamClientSession::StringVector* results = static_cast<PamClientSession::StringVector*>(data);
if (column_vals[0])
{
@ -413,7 +413,7 @@ bool PamClientSession::extract(DCB *dcb, GWBUF *buffer)
default:
MXS_ERROR("Unexpected authentication state: %d", m_state);
ss_dassert(!true);
mxb_assert(!true);
break;
}
return rval;

6
server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
View File

@ -209,7 +209,7 @@ int PamInstance::load_users(SERVICE* service)
delete_old_users();
if (res)
{
ss_dassert(mysql_num_fields(res) == PAM_USERS_QUERY_NUM_FIELDS);
mxb_assert(mysql_num_fields(res) == PAM_USERS_QUERY_NUM_FIELDS);
MXS_NOTICE("Loaded %llu users for service %s.", mysql_num_rows(res),
service->name);
MYSQL_ROW row;
@ -242,7 +242,7 @@ int PamInstance::load_users(SERVICE* service)
void PamInstance::diagnostic(DCB* dcb)
{
json_t* array = diagnostic_json();
ss_dassert(json_is_array(array));
mxb_assert(json_is_array(array));
string result, separator;
size_t index;
@ -269,7 +269,7 @@ void PamInstance::diagnostic(DCB* dcb)
static int diag_cb_json(void *data, int columns, char **row, char **field_names)
{
ss_dassert(columns == NUM_FIELDS);
mxb_assert(columns == NUM_FIELDS);
json_t* obj = json_object();
for (int i = 0; i < columns; i++)
{