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

Rename MODULE_INFO to MXS_MODULE

Browse Source 
The MODULE_INFO is now the main object which is used by modules to convey
information to the MaxScale core. The MXS_MODULE name is more apt as it
now contains the actual module definition.

The old MODULES structure was moved into load_utils.c as an internal
implementation and was renamed so that it is not confused with the new
MODULE structure.
This commit is contained in:
Markus Mäkelä
2017-01-03 14:42:30 +02:00
parent d42c6b455d
commit c96bd64aa8
53 changed files with 273 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
View File

@ -143,7 +143,7 @@ static bool cdc_add_new_user(const MODULECMD_ARG *args)
*
* @return The module object
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static modulecmd_arg_type_t args[] =
{
@ -166,10 +166,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
cdc_replace_users /* Load CDC users */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"The CDC client to MaxScale authenticator implementation",
"V1.1.0",

8
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
View File

@ -599,7 +599,7 @@ int gssapi_auth_load_users(SERV_LISTENER *listener)
/**
* Module handle entry point
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static GWAUTHENTICATOR MyObject =
{
@ -613,10 +613,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
gssapi_auth_load_users /* Load database users */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"GSSAPI authenticator",
"V1.0.0",

8
server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
View File

@ -263,7 +263,7 @@ static int gssapi_backend_auth_authenticate(DCB *dcb)
/**
* Module handle entry point
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static GWAUTHENTICATOR MyObject =
{
@ -277,10 +277,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
NULL /* Load users from backend databases */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"GSSAPI backend authenticator",
"V1.0.0",

8
server/modules/authenticator/HTTPAuth/http_auth.c
View File

@ -53,7 +53,7 @@ typedef struct http_auth
*
* @return The module object
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static GWAUTHENTICATOR MyObject =
{
@ -67,10 +67,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
users_default_loadusers /* Load generic users */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"The MaxScale HTTP BA authenticator",
"V1.1.0",

8
server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
View File

@ -47,7 +47,7 @@ static void max_admin_auth_free_client_data(DCB *dcb);
*
* @return The module object
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static GWAUTHENTICATOR MyObject =
{
@ -61,10 +61,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
users_default_loadusers /* Load generic users */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"The MaxScale Admin client authenticator implementation",
"V2.1.0",

8
server/modules/authenticator/MySQLAuth/mysql_auth.c
View File

@ -71,7 +71,7 @@ static int mysql_auth_set_client_data(
*
* @return The module object
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static GWAUTHENTICATOR MyObject =
{
@ -85,10 +85,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
mysql_auth_load_users /* Load users from backend databases */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"The MySQL client to MaxScale authenticator implementation",
"V1.1.0",

8
server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
View File

@ -156,7 +156,7 @@ static bool auth_backend_ssl(DCB *dcb)
*
* @return The module object
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static GWAUTHENTICATOR MyObject =
{
@ -170,10 +170,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
NULL /* We don't need to load users */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"The MySQL MaxScale to backend server authenticator",
"V1.0.0",

8
server/modules/authenticator/NullAuthAllow/null_auth_allow.c
View File

@ -49,7 +49,7 @@ static void null_auth_free_client_data(DCB *dcb);
*
* @return The module object
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static GWAUTHENTICATOR MyObject =
{
@ -63,10 +63,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
users_default_loadusers /* Load generic users */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"The Null client authenticator implementation",
"V1.1.0",

8
server/modules/authenticator/NullAuthDeny/null_auth_deny.c
View File

@ -46,7 +46,7 @@ static void null_auth_free_client_data(DCB *dcb);
*
* @return The module object
*/
MODULE_INFO* MXS_CREATE_MODULE()
MXS_MODULE* MXS_CREATE_MODULE()
{
static GWAUTHENTICATOR MyObject =
{
@ -60,10 +60,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
users_default_loadusers /* Load generic users */
};
static MODULE_INFO info =
static MXS_MODULE info =
{
MODULE_API_AUTHENTICATOR,
MODULE_GA,
MXS_MODULE_API_AUTHENTICATOR,
MXS_MODULE_GA,
GWAUTHENTICATOR_VERSION,
"The Null client authenticator implementation",
"V1.1.0",