Rename MODULE_INFO to MXS_MODULE

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.
2017-01-03 14:42:30 +02:00
parent d42c6b455d
commit c96bd64aa8
53 changed files with 273 additions and 273 deletions
--- a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
+++ b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
@ -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",
--- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
+++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
@ -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",
--- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
+++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
@ -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",
--- a/server/modules/authenticator/HTTPAuth/http_auth.c
+++ b/server/modules/authenticator/HTTPAuth/http_auth.c
@ -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",
--- a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
+++ b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
@ -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",
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.c
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.c
@ -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",
--- a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
+++ b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
@ -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",
--- a/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
+++ b/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
@ -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",
--- a/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
+++ b/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
@ -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",
--- a/server/modules/filter/cache/cachefilter.cc
+++ b/server/modules/filter/cache/cachefilter.cc
@ -193,7 +193,7 @@ bool config_get_uint64(const FILTER_PARAMETER& param, uint64_t* pValue)
 // Global symbols of the Module
 //

-extern "C" MODULE_INFO* MXS_CREATE_MODULE()
+extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
    static modulecmd_arg_type_t show_argv[] =
    {
@ -206,10 +206,10 @@ extern "C" MODULE_INFO* MXS_CREATE_MODULE()
    
    MXS_NOTICE("Initialized cache module %s.\n", VERSION_STRING);

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_IN_DEVELOPMENT,
        FILTER_VERSION,
        "A caching filter that is capable of caching and returning cached data.",
        VERSION_STRING,
--- a/server/modules/filter/ccrfilter/ccrfilter.c
+++ b/server/modules/filter/ccrfilter/ccrfilter.c
@ -99,7 +99,7 @@ typedef struct
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -116,10 +116,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
        FILTER_VERSION,
        "A routing hint filter that send queries to the master after data modification",
        "V1.1.0",
--- a/server/modules/filter/dbfwfilter/dbfwfilter.c
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.c
@ -777,7 +777,7 @@ bool dbfw_show_rules(const MODULECMD_ARG *argv)
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    modulecmd_arg_type_t args_rules_reload[] =
    {
@ -810,10 +810,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
        FILTER_VERSION,
        "Firewall Filter",
        "V1.2.0",
--- a/server/modules/filter/hintfilter/hintfilter.c
+++ b/server/modules/filter/hintfilter/hintfilter.c
@ -40,7 +40,7 @@ static uint64_t getCapabilities(void);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -57,10 +57,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_ALPHA_RELEASE,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_ALPHA_RELEASE,
        FILTER_VERSION,
        "A hint parsing filter",
        "V1.0.0",
--- a/server/modules/filter/luafilter/luafilter.c
+++ b/server/modules/filter/luafilter/luafilter.c
@ -72,7 +72,7 @@ static uint64_t getCapabilities(void);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -89,10 +89,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_EXPERIMENTAL,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_EXPERIMENTAL,
        FILTER_VERSION,
        "Lua Filter",
        "V1.0.0",
--- a/server/modules/filter/masking/maskingfilter.cc
+++ b/server/modules/filter/masking/maskingfilter.cc
@ -18,14 +18,14 @@
 // Global symbols of the Module
 //

-extern "C" MODULE_INFO* MXS_CREATE_MODULE()
+extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialized masking module.");

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_IN_DEVELOPMENT,
        FILTER_VERSION,
        "A masking filter that is capable of masking/obfuscating returned column values.",
        "V1.0.0",
--- a/server/modules/filter/maxrows/maxrows.c
+++ b/server/modules/filter/maxrows/maxrows.c
@ -64,7 +64,7 @@ static uint64_t getCapabilities(void);
 *
 * @return The module object.
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT object =
    {
@ -81,10 +81,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_IN_DEVELOPMENT,
        FILTER_VERSION,
        "A filter that is capable of limiting the resultset number of rows.",
        "V1.0.0",
--- a/server/modules/filter/mqfilter/mqfilter.c
+++ b/server/modules/filter/mqfilter/mqfilter.c
@ -245,7 +245,7 @@ void sendMessage(void* data);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -262,10 +262,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_ALPHA_RELEASE,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_ALPHA_RELEASE,
        FILTER_VERSION,
        "A RabbitMQ query logging filter",
        "V1.0.2",
--- a/server/modules/filter/namedserverfilter/namedserverfilter.c
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.c
@ -80,7 +80,7 @@ typedef struct
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -97,10 +97,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
        FILTER_VERSION,
        "A routing hint filter that uses regular expressions to direct queries",
        "V1.1.0",
--- a/server/modules/filter/qlafilter/qlafilter.c
+++ b/server/modules/filter/qlafilter/qlafilter.c
@ -139,7 +139,7 @@ static int write_log_entry(uint32_t, FILE*, QLA_INSTANCE*, QLA_SESSION*, const c
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -156,10 +156,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
        FILTER_VERSION,
        "A simple query logging filter",
        "V1.1.1",
--- a/server/modules/filter/regexfilter/regexfilter.c
+++ b/server/modules/filter/regexfilter/regexfilter.c
@ -90,7 +90,7 @@ void log_nomatch(REGEX_INSTANCE* inst, char* re, char* old);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -107,10 +107,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
        FILTER_VERSION,
        "A query rewrite filter that uses regular expressions to rewrite queries",
        "V1.1.0",
--- a/server/modules/filter/tee/tee.c
+++ b/server/modules/filter/tee/tee.c
@ -289,7 +289,7 @@ orphan_free(void* data)
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    spinlock_init(&orphanLock);
 #ifdef SS_DEBUG
@ -311,10 +311,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
        FILTER_VERSION,
        "A tee piece in the filter plumbing",
        "V1.0.0",
--- a/server/modules/filter/testfilter/testfilter.c
+++ b/server/modules/filter/testfilter/testfilter.c
@ -69,7 +69,7 @@ typedef struct
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -86,10 +86,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        destroyInstance,
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_BETA_RELEASE,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_BETA_RELEASE,
        FILTER_VERSION,
        "A simple query counting filter",
        "V2.0.0",
--- a/server/modules/filter/topfilter/topfilter.c
+++ b/server/modules/filter/topfilter/topfilter.c
@ -123,7 +123,7 @@ typedef struct
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -140,10 +140,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
        FILTER_VERSION,
        "A top N query logging filter",
        "V1.0.1",
--- a/server/modules/filter/tpmfilter/tpmfilter.c
+++ b/server/modules/filter/tpmfilter/tpmfilter.c
@ -142,7 +142,7 @@ typedef struct
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static FILTER_OBJECT MyObject =
    {
@ -159,10 +159,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL, // No destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
        FILTER_VERSION,
        "Transaction Performance Monitoring filter",
        "V1.0.1",
--- a/server/modules/monitor/auroramon/auroramon.c
+++ b/server/modules/monitor/auroramon/auroramon.c
@ -344,7 +344,7 @@ diagnostics(DCB *dcb, const MONITOR *mon)
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static MONITOR_OBJECT MyObject =
    {
@ -353,10 +353,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        diagnostics
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_MONITOR,
-        MODULE_BETA_RELEASE,
+        MXS_MODULE_API_MONITOR,
+        MXS_MODULE_BETA_RELEASE,
        MONITOR_VERSION,
        "Aurora monitor",
        "V1.0.0",
--- a/server/modules/monitor/galeramon/galeramon.c
+++ b/server/modules/monitor/galeramon/galeramon.c
@ -59,7 +59,7 @@ bool isGaleraEvent(monitor_event_t event);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise the MySQL Galera Monitor module.");

@ -70,10 +70,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        diagnostics
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_MONITOR,
-        MODULE_GA,
+        MXS_MODULE_API_MONITOR,
+        MXS_MODULE_GA,
        MONITOR_VERSION,
        "A Galera cluster monitor",
        "V2.0.0",
--- a/server/modules/monitor/mmmon/mmmon.c
+++ b/server/modules/monitor/mmmon/mmmon.c
@ -35,10 +35,10 @@ static void monitorMain(void *);
 * lint directives.
 */
 /*lint -e14 */
-MODULE_INFO info =
+MXS_MODULE info =
 {
-    MODULE_API_MONITOR,
-    MODULE_BETA_RELEASE,
+    MXS_MODULE_API_MONITOR,
+    MXS_MODULE_BETA_RELEASE,
    MONITOR_VERSION,
    "A Multi-Master Multi Master monitor",
    "V1.1.1"
@ -60,7 +60,7 @@ static bool isMySQLEvent(monitor_event_t event);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise the Multi-Master Monitor module.");

@ -71,10 +71,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        diagnostics
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_MONITOR,
-        MODULE_BETA_RELEASE,
+        MXS_MODULE_API_MONITOR,
+        MXS_MODULE_BETA_RELEASE,
        MONITOR_VERSION,
        "A Multi-Master Multi Master monitor",
        "V1.1.1",
--- a/server/modules/monitor/mysqlmon/mysql_mon.c
+++ b/server/modules/monitor/mysqlmon/mysql_mon.c
@ -94,7 +94,7 @@ static const char* hb_table_name = "maxscale_schema.replication_heartbeat";
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise the MySQL Monitor module.");

@ -105,10 +105,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        diagnostics
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_MONITOR,
-        MODULE_GA,
+        MXS_MODULE_API_MONITOR,
+        MXS_MODULE_GA,
        MONITOR_VERSION,
        "A MySQL Master/Slave replication monitor",
        "V1.5.0",
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.c
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.c
@ -53,7 +53,7 @@ bool isNdbEvent(monitor_event_t event);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise the MySQL Cluster Monitor module.");

@ -64,10 +64,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        diagnostics
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_MONITOR,
-        MODULE_BETA_RELEASE,
+        MXS_MODULE_API_MONITOR,
+        MXS_MODULE_BETA_RELEASE,
        MONITOR_VERSION,
        "A MySQL cluster SQL node monitor",
        "V2.1.0",
--- a/server/modules/protocol/CDC/cdc.c
+++ b/server/modules/protocol/CDC/cdc.c
@ -68,7 +68,7 @@ static char* cdc_default_auth()
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static GWPROTOCOL MyObject =
    {
@ -86,10 +86,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        cdc_default_auth /* default authentication */
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_PROTOCOL,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_PROTOCOL,
+        MXS_MODULE_IN_DEVELOPMENT,
        GWPROTOCOL_VERSION,
        "A Change Data Capture Listener implementation for use in binlog events retrieval",
        "V1.0.0"
--- a/server/modules/protocol/HTTPD/httpd.c
+++ b/server/modules/protocol/HTTPD/httpd.c
@ -63,7 +63,7 @@ static char *httpd_default_auth();
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static GWPROTOCOL MyObject =
    {
@ -82,10 +82,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL                /**< Connection limit reached      */
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_PROTOCOL,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_PROTOCOL,
+        MXS_MODULE_IN_DEVELOPMENT,
        GWPROTOCOL_VERSION,
        "An experimental HTTPD implementation for use in administration",
        "V1.2.0",
--- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
+++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
@ -85,7 +85,7 @@ static int gw_send_change_user_to_backend(char          *dbname,
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static GWPROTOCOL MyObject =
    {
@ -104,10 +104,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL                        /* Connection limit reached      */
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_PROTOCOL,
-        MODULE_GA,
+        MXS_MODULE_API_PROTOCOL,
+        MXS_MODULE_GA,
        GWPROTOCOL_VERSION,
        "The MySQL to backend server protocol",
        "V2.0.0",
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@ -93,7 +93,7 @@ static void gw_process_one_new_client(DCB *client_dcb);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static GWPROTOCOL MyObject =
    {
@ -112,10 +112,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        gw_connection_limit                     /* Send error connection limit   */
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_PROTOCOL,
-        MODULE_GA,
+        MXS_MODULE_API_PROTOCOL,
+        MXS_MODULE_GA,
        GWPROTOCOL_VERSION,
        "The client to MaxScale MySQL protocol implementation",
        "V1.1.0",
--- a/server/modules/protocol/maxscaled/maxscaled.c
+++ b/server/modules/protocol/maxscaled/maxscaled.c
@ -164,7 +164,7 @@ static bool authenticate_socket(MAXSCALED *protocol, DCB *dcb)
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_INFO("Initialise MaxScaled Protocol module.");

@ -185,10 +185,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL                            /**< Connection limit reached      */
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_PROTOCOL,
-        MODULE_GA,
+        MXS_MODULE_API_PROTOCOL,
+        MXS_MODULE_GA,
        GWPROTOCOL_VERSION,
        "A maxscale protocol for the administration interface",
        "V2.0.0",
--- a/server/modules/protocol/telnetd/telnetd.c
+++ b/server/modules/protocol/telnetd/telnetd.c
@ -81,7 +81,7 @@ static void telnetd_echo(DCB *dcb, int enable);
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_INFO("Initialise Telnetd Protocol module.");

@ -102,10 +102,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL                            /**< Connection limit reached      */
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_PROTOCOL,
-        MODULE_GA,
+        MXS_MODULE_API_PROTOCOL,
+        MXS_MODULE_GA,
        GWPROTOCOL_VERSION,
        "A telnet deamon protocol for simple administration interface",
        "V1.1.1",
--- a/server/modules/protocol/testprotocol/testprotocol.c
+++ b/server/modules/protocol/testprotocol/testprotocol.c
@ -52,7 +52,7 @@ static int test_connection_limit(DCB *dcb, int limit){return 0;}
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static GWPROTOCOL MyObject =
    {
@ -71,10 +71,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        test_connection_limit   /**< Connection limit        */
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_PROTOCOL,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_PROTOCOL,
+        MXS_MODULE_IN_DEVELOPMENT,
        GWPROTOCOL_VERSION,
        "Test protocol",
        "V1.1.0",
--- a/server/modules/routing/avrorouter/avro.c
+++ b/server/modules/routing/avrorouter/avro.c
@ -126,7 +126,7 @@ bool avro_handle_convert(const MODULECMD_ARG *args)
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    spinlock_init(&instlock);
    instances = NULL;
@ -152,10 +152,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
        ROUTER_VERSION,
        "Binlogrouter",
        "V1.0.0",
--- a/server/modules/routing/binlogrouter/blr.c
+++ b/server/modules/routing/binlogrouter/blr.c
@ -134,7 +134,7 @@ static ROUTER_INSTANCE *instances;
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise binlog router module.");
    spinlock_init(&instlock);
@ -154,10 +154,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        destroyInstance
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
        ROUTER_VERSION,
        "Binlogrouter",
        "V2.1.0",
--- a/server/modules/routing/cli/cli.c
+++ b/server/modules/routing/cli/cli.c
@ -62,7 +62,7 @@ static CLI_INSTANCE *instances;
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise CLI router module");
    spinlock_init(&instlock);
@ -82,10 +82,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
        ROUTER_VERSION,
        "The admin user interface",
        "V1.0.0",
--- a/server/modules/routing/debugcli/debugcli.c
+++ b/server/modules/routing/debugcli/debugcli.c
@ -61,7 +61,7 @@ static CLI_INSTANCE *instances;
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise debug CLI router module.");
    spinlock_init(&instlock);
@ -81,10 +81,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
        ROUTER_VERSION,
        "The debug user interface",
        "V1.1.1",
--- a/server/modules/routing/maxinfo/maxinfo.c
+++ b/server/modules/routing/maxinfo/maxinfo.c
@ -85,7 +85,7 @@ static INFO_INSTANCE    *instances;
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise MaxInfo router module.");
    spinlock_init(&instlock);
@ -105,10 +105,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER,
-        MODULE_ALPHA_RELEASE,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_ALPHA_RELEASE,
        ROUTER_VERSION,
        "The MaxScale Information Schema",
        "V1.0.0",
--- a/server/modules/routing/readconnroute/readconnroute.c
+++ b/server/modules/routing/readconnroute/readconnroute.c
@ -118,7 +118,7 @@ static ROUTER_INSTANCE *instances;
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initialise readconnroute router module.");
    spinlock_init(&instlock);
@ -138,10 +138,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
        ROUTER_VERSION,
        "A connection based router to load balance based on connections",
        "V1.1.0",
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@ -113,7 +113,7 @@ static bool create_backends(ROUTER_CLIENT_SES *rses, backend_ref_t** dest, int*
 *
 * @return The module object
 */
-MODULE_INFO *MXS_CREATE_MODULE()
+MXS_MODULE *MXS_CREATE_MODULE()
 {
    static ROUTER_OBJECT MyObject =
    {
@ -129,9 +129,9 @@ MODULE_INFO *MXS_CREATE_MODULE()
        NULL
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER, MODULE_GA, ROUTER_VERSION,
+        MXS_MODULE_API_ROUTER, MXS_MODULE_GA, ROUTER_VERSION,
        "A Read/Write splitting router for enhancement read scalability",
        "V1.1.0",
        &MyObject
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@ -591,7 +591,7 @@ bool check_shard_status(ROUTER_INSTANCE* router, char* shard)
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    MXS_NOTICE("Initializing Schema Sharding Router.");
    spinlock_init(&instlock);
@ -611,10 +611,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER,
-        MODULE_BETA_RELEASE,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_BETA_RELEASE,
        ROUTER_VERSION,
        "A database sharding router for simple sharding",
        "V1.0.0",
--- a/server/modules/routing/testroute/testroute.c
+++ b/server/modules/routing/testroute/testroute.c
@ -46,7 +46,7 @@ typedef struct
 *
 * @return The module object
 */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
    static ROUTER_OBJECT MyObject =
    {
@ -62,10 +62,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
        NULL
    };

-    static MODULE_INFO info =
+    static MXS_MODULE info =
    {
-        MODULE_API_ROUTER,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_IN_DEVELOPMENT,
        ROUTER_VERSION,
        "A test router - not for use in real systems",
        "V1.0.0",