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
include/maxscale/backend.hh
View File

@ -100,7 +100,7 @@ public:
*/
inline bool has_session_commands() const
{
ss_dassert(in_use());
mxb_assert(in_use());
return !m_session_commands.empty();
}
@ -125,7 +125,7 @@ public:
*/
inline SERVER_REF* backend() const
{
ss_dassert(m_backend);
mxb_assert(m_backend);
return m_backend;
}
@ -136,7 +136,7 @@ public:
*/
inline SERVER* server() const
{
ss_dassert(m_backend);
mxb_assert(m_backend);
return m_backend->server;
}

10
include/maxscale/buffer.hh
View File

@ -72,7 +72,7 @@ public:
void advance()
{
ss_dassert(m_i != m_end);
mxb_assert(m_i != m_end);
++m_i;
@ -151,7 +151,7 @@ public:
reference operator*()
{
ss_dassert(m_i);
mxb_assert(m_i);
return *m_i;
}
};
@ -198,7 +198,7 @@ public:
reference operator*() const
{
ss_dassert(m_i);
mxb_assert(m_i);
return *m_i;
}
};
@ -226,7 +226,7 @@ public:
if (!m_pBuffer)
{
ss_dassert(!true);
mxb_assert(!true);
throw std::bad_alloc();
}
}
@ -666,7 +666,7 @@ public:
{
if (!make_contiguous(std::nothrow))
{
ss_dassert(!true);
mxb_assert(!true);
throw std::bad_alloc();
}
}

2
include/maxscale/customparser.hh
View File

@ -116,7 +116,7 @@ protected:
*/
bool is_next_alpha(char uc, int offset = 1) const
{
ss_dassert(uc >= 'A' && uc <= 'Z');
mxb_assert(uc >= 'A' && uc <= 'Z');
char lc = uc + ('a' - 'A');

3
include/maxscale/debug.h
View File

@ -18,7 +18,4 @@
MXS_BEGIN_DECLS
#define ss_dassert mxb_assert
#define ss_info_dassert mxb_assert_message
MXS_END_DECLS

2
include/maxscale/jansson.hh
View File

@ -97,7 +97,7 @@ static inline std::string json_to_string(json_t* json)
break;
default:
ss_dassert(false);
mxb_assert(false);
break;
}

6
include/maxscale/modinfo.h
View File

@ -254,7 +254,7 @@ static inline const char* mxs_module_param_type_to_string(enum mxs_module_param_
case MXS_MODULE_PARAM_REGEX:
return "regular expression";
default:
ss_dassert(!true);
mxb_assert(!true);
return "unknown";
}
}
@ -276,7 +276,7 @@ static inline const char* mxs_module_api_to_string(MXS_MODULE_API type)
case MXS_MODULE_API_QUERY_CLASSIFIER:
return "query_classifier";
default:
ss_dassert(!true);
mxb_assert(!true);
return "unknown";
}
}
@ -296,7 +296,7 @@ static inline const char* mxs_module_status_to_string(MXS_MODULE_STATUS type)
case MXS_MODULE_EXPERIMENTAL:
return "Experimental";
default:
ss_dassert(!true);
mxb_assert(!true);
return "Unknown";
}
}

2
include/maxscale/queryclassifier.hh
View File

@ -207,7 +207,7 @@ public:
{
if (state == LOAD_DATA_ACTIVE)
{
ss_dassert(m_load_data_state == LOAD_DATA_INACTIVE);
mxb_assert(m_load_data_state == LOAD_DATA_INACTIVE);
reset_load_data_sent();
}