From d0cc246b79e9d2a60e4b576893279c657935a595 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Fri, 13 Jan 2017 10:21:51 +0200 Subject: [PATCH] Rename FILTER to MXS_FILTER --- include/maxscale/filter.h | 40 +++++++++---------- include/maxscale/filter.hh | 22 +++++----- server/modules/filter/ccrfilter/ccrfilter.c | 30 +++++++------- server/modules/filter/dbfwfilter/dbfwfilter.c | 30 +++++++------- server/modules/filter/hintfilter/hintfilter.c | 30 +++++++------- server/modules/filter/maxrows/maxrows.c | 38 +++++++++--------- server/modules/filter/mqfilter/mqfilter.c | 38 +++++++++--------- .../namedserverfilter/namedserverfilter.c | 30 +++++++------- server/modules/filter/qlafilter/qlafilter.c | 30 +++++++------- .../modules/filter/regexfilter/regexfilter.c | 30 +++++++------- server/modules/filter/tee/tee.c | 38 +++++++++--------- server/modules/filter/testfilter/testfilter.c | 34 ++++++++-------- server/modules/filter/topfilter/topfilter.c | 38 +++++++++--------- server/modules/filter/tpmfilter/tpmfilter.c | 38 +++++++++--------- 14 files changed, 233 insertions(+), 233 deletions(-) diff --git a/include/maxscale/filter.h b/include/maxscale/filter.h index a06f81efb..bf6e93c6c 100644 --- a/include/maxscale/filter.h +++ b/include/maxscale/filter.h @@ -36,7 +36,7 @@ MXS_BEGIN_DECLS * The FILTER handle points to module specific data, so the best we can do * is to make it a void * externally. */ -typedef void *FILTER; +typedef void *MXS_FILTER; /** * @verbatim @@ -63,19 +63,19 @@ typedef void *FILTER; */ typedef struct mxs_filter_object { - FILTER *(*createInstance)(const char *name, - char **options, - CONFIG_PARAMETER *params); - void *(*newSession)(FILTER *instance, SESSION *session); - void (*closeSession)(FILTER *instance, void *fsession); - void (*freeSession)(FILTER *instance, void *fsession); - void (*setDownstream)(FILTER *instance, void *fsession, DOWNSTREAM *downstream); - void (*setUpstream)(FILTER *instance, void *fsession, UPSTREAM *downstream); - int32_t (*routeQuery)(FILTER *instance, void *fsession, GWBUF *queue); - int32_t (*clientReply)(FILTER *instance, void *fsession, GWBUF *queue); - void (*diagnostics)(FILTER *instance, void *fsession, DCB *dcb); + MXS_FILTER *(*createInstance)(const char *name, + char **options, + CONFIG_PARAMETER *params); + void *(*newSession)(MXS_FILTER *instance, SESSION *session); + void (*closeSession)(MXS_FILTER *instance, void *fsession); + void (*freeSession)(MXS_FILTER *instance, void *fsession); + void (*setDownstream)(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); + void (*setUpstream)(MXS_FILTER *instance, void *fsession, UPSTREAM *downstream); + int32_t (*routeQuery)(MXS_FILTER *instance, void *fsession, GWBUF *queue); + int32_t (*clientReply)(MXS_FILTER *instance, void *fsession, GWBUF *queue); + void (*diagnostics)(MXS_FILTER *instance, void *fsession, DCB *dcb); uint64_t (*getCapabilities)(void); - void (*destroyInstance)(FILTER *instance); + void (*destroyInstance)(MXS_FILTER *instance); } MXS_FILTER_OBJECT; /** @@ -91,14 +91,14 @@ typedef struct mxs_filter_object */ typedef struct filter_def { - char *name; /**< The Filter name */ - char *module; /**< The module to load */ - char **options; /**< The options set for this filter */ + char *name; /**< The Filter name */ + char *module; /**< The module to load */ + char **options; /**< The options set for this filter */ CONFIG_PARAMETER *parameters; /**< The filter parameters */ - FILTER filter; /**< The runtime filter */ - MXS_FILTER_OBJECT *obj; /**< The "MODULE_OBJECT" for the filter */ - SPINLOCK spin; /**< Spinlock to protect the filter definition */ - struct filter_def *next; /**< Next filter in the chain of all filters */ + MXS_FILTER* filter; /**< The runtime filter */ + MXS_FILTER_OBJECT *obj; /**< The "MODULE_OBJECT" for the filter */ + SPINLOCK spin; /**< Spinlock to protect the filter definition */ + struct filter_def *next; /**< Next filter in the chain of all filters */ } FILTER_DEF; FILTER_DEF *filter_alloc(const char *, const char *); diff --git a/include/maxscale/filter.hh b/include/maxscale/filter.hh index 80952be10..5338c1809 100644 --- a/include/maxscale/filter.hh +++ b/include/maxscale/filter.hh @@ -203,16 +203,16 @@ template class Filter { public: - static FILTER* createInstance(const char* zName, char** pzOptions, CONFIG_PARAMETER* ppParams) + static MXS_FILTER* createInstance(const char* zName, char** pzOptions, CONFIG_PARAMETER* ppParams) { FilterType* pFilter = NULL; MXS_EXCEPTION_GUARD(pFilter = FilterType::create(zName, pzOptions, ppParams)); - return reinterpret_cast(pFilter); + return reinterpret_cast(pFilter); } - static void* newSession(FILTER* pInstance, SESSION* pSession) + static void* newSession(MXS_FILTER* pInstance, SESSION* pSession) { FilterType* pFilter = reinterpret_cast(pInstance); void* pFilterSession; @@ -222,21 +222,21 @@ public: return pFilterSession; } - static void closeSession(FILTER*, void* pData) + static void closeSession(MXS_FILTER*, void* pData) { FilterSessionType* pFilterSession = static_cast(pData); MXS_EXCEPTION_GUARD(pFilterSession->close()); } - static void freeSession(FILTER*, void* pData) + static void freeSession(MXS_FILTER*, void* pData) { FilterSessionType* pFilterSession = static_cast(pData); MXS_EXCEPTION_GUARD(delete pFilterSession); } - static void setDownstream(FILTER*, void* pData, DOWNSTREAM* pDownstream) + static void setDownstream(MXS_FILTER*, void* pData, DOWNSTREAM* pDownstream) { FilterSessionType* pFilterSession = static_cast(pData); @@ -245,7 +245,7 @@ public: MXS_EXCEPTION_GUARD(pFilterSession->setDownstream(down)); } - static void setUpstream(FILTER* pInstance, void* pData, UPSTREAM* pUpstream) + static void setUpstream(MXS_FILTER* pInstance, void* pData, UPSTREAM* pUpstream) { FilterSessionType* pFilterSession = static_cast(pData); @@ -254,7 +254,7 @@ public: MXS_EXCEPTION_GUARD(pFilterSession->setUpstream(up)); } - static int routeQuery(FILTER* pInstance, void* pData, GWBUF* pPacket) + static int routeQuery(MXS_FILTER* pInstance, void* pData, GWBUF* pPacket) { FilterSessionType* pFilterSession = static_cast(pData); @@ -264,7 +264,7 @@ public: return rv; } - static int clientReply(FILTER* pInstance, void* pData, GWBUF* pPacket) + static int clientReply(MXS_FILTER* pInstance, void* pData, GWBUF* pPacket) { FilterSessionType* pFilterSession = static_cast(pData); @@ -274,7 +274,7 @@ public: return rv; } - static void diagnostics(FILTER* pInstance, void* pData, DCB* pDcb) + static void diagnostics(MXS_FILTER* pInstance, void* pData, DCB* pDcb) { if (pData) { @@ -299,7 +299,7 @@ public: return rv; } - static void destroyInstance(FILTER* pInstance) + static void destroyInstance(MXS_FILTER* pInstance) { FilterType* pFilter = reinterpret_cast(pInstance); diff --git a/server/modules/filter/ccrfilter/ccrfilter.c b/server/modules/filter/ccrfilter/ccrfilter.c index 8a895d13b..e395afc28 100644 --- a/server/modules/filter/ccrfilter/ccrfilter.c +++ b/server/modules/filter/ccrfilter/ccrfilter.c @@ -46,13 +46,13 @@ * @endverbatim */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); #define CCR_DEFAULT_TIME "60" @@ -150,7 +150,7 @@ MXS_MODULE* MXS_CREATE_MODULE() * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { CCR_INSTANCE *my_instance; @@ -211,7 +211,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) } } - return (FILTER *)my_instance; + return (MXS_FILTER *)my_instance; } /** @@ -223,7 +223,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { CCR_INSTANCE *my_instance = (CCR_INSTANCE *)instance; CCR_SESSION *my_session = MXS_MALLOC(sizeof(CCR_SESSION)); @@ -245,7 +245,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { } @@ -256,7 +256,7 @@ closeSession(FILTER *instance, void *session) * @param session The session being closed */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { MXS_FREE(session); } @@ -269,7 +269,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { CCR_SESSION *my_session = (CCR_SESSION *)session; @@ -291,7 +291,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { CCR_INSTANCE *my_instance = (CCR_INSTANCE *)instance; CCR_SESSION *my_session = (CCR_SESSION *)session; @@ -353,7 +353,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { CCR_INSTANCE *my_instance = (CCR_INSTANCE *)instance; CCR_SESSION *my_session = (CCR_SESSION *)fsession; diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.c b/server/modules/filter/dbfwfilter/dbfwfilter.c index f99f6a48d..381c5891a 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.c +++ b/server/modules/filter/dbfwfilter/dbfwfilter.c @@ -94,13 +94,13 @@ int dbfw_yyparse(void*); /* * The filter entry points */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); /** @@ -1537,7 +1537,7 @@ bool replace_rules(FW_INSTANCE* instance) * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { FW_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(FW_INSTANCE)); @@ -1579,7 +1579,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) rule_free_all(rules); hashtable_free(users); - return (FILTER *) my_instance; + return (MXS_FILTER *) my_instance; } /** @@ -1590,7 +1590,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { FW_SESSION *my_session; @@ -1610,7 +1610,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { } @@ -1621,7 +1621,7 @@ closeSession(FILTER *instance, void *session) * @param session The filter session */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { FW_SESSION *my_session = (FW_SESSION *) session; MXS_FREE(my_session->errmsg); @@ -1638,7 +1638,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router. */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { FW_SESSION *my_session = (FW_SESSION *) session; my_session->down = *downstream; @@ -2308,7 +2308,7 @@ DBFW_USER* find_user_data(HASHTABLE *hash, const char *name, const char *remote) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { FW_SESSION *my_session = (FW_SESSION *) session; FW_INSTANCE *my_instance = (FW_INSTANCE *) instance; @@ -2452,7 +2452,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { FW_INSTANCE *my_instance = (FW_INSTANCE *) instance; diff --git a/server/modules/filter/hintfilter/hintfilter.c b/server/modules/filter/hintfilter/hintfilter.c index 947085e9b..d34de0795 100644 --- a/server/modules/filter/hintfilter/hintfilter.c +++ b/server/modules/filter/hintfilter/hintfilter.c @@ -23,13 +23,13 @@ * */ -static FILTER *createInstance(const char* name, char **options, CONFIG_PARAMETER *params); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char* name, char **options, CONFIG_PARAMETER *params); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); /** @@ -87,7 +87,7 @@ MXS_MODULE* MXS_CREATE_MODULE() * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { HINT_INSTANCE *my_instance; @@ -96,7 +96,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { my_instance->sessions = 0; } - return (FILTER *)my_instance; + return (MXS_FILTER *)my_instance; } /** @@ -107,7 +107,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { HINT_INSTANCE *my_instance = (HINT_INSTANCE *)instance; HINT_SESSION *my_session; @@ -131,7 +131,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { HINT_SESSION *my_session = (HINT_SESSION *)session; NAMEDHINTS* named_hints; @@ -162,7 +162,7 @@ closeSession(FILTER *instance, void *session) * @param session The session being closed */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { MXS_FREE(session); return; @@ -176,7 +176,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { HINT_SESSION *my_session = (HINT_SESSION *)session; @@ -194,7 +194,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { HINT_SESSION *my_session = (HINT_SESSION *)session; @@ -223,7 +223,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { HINT_INSTANCE *my_instance = (HINT_INSTANCE *)instance; HINT_SESSION *my_session = (HINT_SESSION *)fsession; diff --git a/server/modules/filter/maxrows/maxrows.c b/server/modules/filter/maxrows/maxrows.c index 6fd9735c2..2c4c5a143 100644 --- a/server/modules/filter/maxrows/maxrows.c +++ b/server/modules/filter/maxrows/maxrows.c @@ -46,15 +46,15 @@ #include #include "maxrows.h" -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *sdata); -static void freeSession(FILTER *instance, void *sdata); -static void setDownstream(FILTER *instance, void *sdata, DOWNSTREAM *downstream); -static void setUpstream(FILTER *instance, void *sdata, UPSTREAM *upstream); -static int routeQuery(FILTER *instance, void *sdata, GWBUF *queue); -static int clientReply(FILTER *instance, void *sdata, GWBUF *queue); -static void diagnostics(FILTER *instance, void *sdata, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *sdata); +static void freeSession(MXS_FILTER *instance, void *sdata); +static void setDownstream(MXS_FILTER *instance, void *sdata, DOWNSTREAM *downstream); +static void setUpstream(MXS_FILTER *instance, void *sdata, UPSTREAM *upstream); +static int routeQuery(MXS_FILTER *instance, void *sdata, GWBUF *queue); +static int clientReply(MXS_FILTER *instance, void *sdata, GWBUF *queue); +static void diagnostics(MXS_FILTER *instance, void *sdata, DCB *dcb); static uint64_t getCapabilities(void); /* Global symbols of the Module */ @@ -188,7 +188,7 @@ static int send_ok_upstream(MAXROWS_SESSION_DATA *csdata); * * @return The instance data for this new instance */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params) +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { MAXROWS_INSTANCE *cinstance = MXS_CALLOC(1, sizeof(MAXROWS_INSTANCE)); @@ -200,7 +200,7 @@ static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER cinstance->config.debug = config_get_integer(params, "debug"); } - return (FILTER*)cinstance; + return (MXS_FILTER*)cinstance; } /** @@ -211,7 +211,7 @@ static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER * * @return Session specific data for this session */ -static void *newSession(FILTER *instance, SESSION *session) +static void *newSession(MXS_FILTER *instance, SESSION *session) { MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance; MAXROWS_SESSION_DATA *csdata = maxrows_session_data_create(cinstance, session); @@ -225,7 +225,7 @@ static void *newSession(FILTER *instance, SESSION *session) * @param instance The maxrows instance data * @param sdata The session data of the session being closed */ -static void closeSession(FILTER *instance, void *sdata) +static void closeSession(MXS_FILTER *instance, void *sdata) { MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance; MAXROWS_SESSION_DATA *csdata = (MAXROWS_SESSION_DATA*)sdata; @@ -237,7 +237,7 @@ static void closeSession(FILTER *instance, void *sdata) * @param instance The maxrows instance data * @param sdata The session data of the session being closed */ -static void freeSession(FILTER *instance, void *sdata) +static void freeSession(MXS_FILTER *instance, void *sdata) { MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance; MAXROWS_SESSION_DATA *csdata = (MAXROWS_SESSION_DATA*)sdata; @@ -252,7 +252,7 @@ static void freeSession(FILTER *instance, void *sdata) * @param sdata The session data of the session * @param down The downstream filter or router */ -static void setDownstream(FILTER *instance, void *sdata, DOWNSTREAM *down) +static void setDownstream(MXS_FILTER *instance, void *sdata, DOWNSTREAM *down) { MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance; MAXROWS_SESSION_DATA *csdata = (MAXROWS_SESSION_DATA*)sdata; @@ -267,7 +267,7 @@ static void setDownstream(FILTER *instance, void *sdata, DOWNSTREAM *down) * @param sdata The session data of the session * @param up The upstream filter or router */ -static void setUpstream(FILTER *instance, void *sdata, UPSTREAM *up) +static void setUpstream(MXS_FILTER *instance, void *sdata, UPSTREAM *up) { MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance; MAXROWS_SESSION_DATA *csdata = (MAXROWS_SESSION_DATA*)sdata; @@ -282,7 +282,7 @@ static void setUpstream(FILTER *instance, void *sdata, UPSTREAM *up) * @param sdata The filter session data * @param buffer Buffer containing an MySQL protocol packet. */ -static int routeQuery(FILTER *instance, void *sdata, GWBUF *packet) +static int routeQuery(MXS_FILTER *instance, void *sdata, GWBUF *packet) { MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance; MAXROWS_SESSION_DATA *csdata = (MAXROWS_SESSION_DATA*)sdata; @@ -327,7 +327,7 @@ static int routeQuery(FILTER *instance, void *sdata, GWBUF *packet) * @param sdata The filter session data * @param queue The query data */ -static int clientReply(FILTER *instance, void *sdata, GWBUF *data) +static int clientReply(MXS_FILTER *instance, void *sdata, GWBUF *data) { MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance; MAXROWS_SESSION_DATA *csdata = (MAXROWS_SESSION_DATA*)sdata; @@ -405,7 +405,7 @@ static int clientReply(FILTER *instance, void *sdata, GWBUF *data) * @param fsession Filter session, may be NULL * @param dcb The DCB for diagnostic output */ -static void diagnostics(FILTER *instance, void *sdata, DCB *dcb) +static void diagnostics(MXS_FILTER *instance, void *sdata, DCB *dcb) { MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance; MAXROWS_SESSION_DATA *csdata = (MAXROWS_SESSION_DATA*)sdata; diff --git a/server/modules/filter/mqfilter/mqfilter.c b/server/modules/filter/mqfilter/mqfilter.c index a9a75f343..d8af6a14b 100644 --- a/server/modules/filter/mqfilter/mqfilter.c +++ b/server/modules/filter/mqfilter/mqfilter.c @@ -83,15 +83,15 @@ static int hktask_id = 0; /* * The filter entry points */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static void setUpstream(FILTER *instance, void *fsession, UPSTREAM *upstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static int clientReply(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static void setUpstream(MXS_FILTER *instance, void *fsession, UPSTREAM *upstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static int clientReply(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); /** @@ -515,7 +515,7 @@ char** parse_optstr(const char* str, const char* tok, int* szstore) * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { MQ_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(MQ_INSTANCE)); @@ -617,7 +617,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) hktask_add(taskname, sendMessage, (void*)my_instance, 5); } - return (FILTER *)my_instance; + return (MXS_FILTER *)my_instance; } /** @@ -800,7 +800,7 @@ void pushMessage(MQ_INSTANCE *instance, amqp_basic_properties_t* prop, char* msg * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { MYSQL_session *sessauth = session->client_dcb->data; char *db = sessauth->db; @@ -846,7 +846,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) { } +closeSession(MXS_FILTER *instance, void *session) { } /** * Free the memory associated with the session @@ -855,7 +855,7 @@ closeSession(FILTER *instance, void *session) { } * @param session The filter session */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { MQ_SESSION *my_session = (MQ_SESSION *) session; MXS_FREE(my_session->uid); @@ -873,13 +873,13 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router. */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { MQ_SESSION *my_session = (MQ_SESSION *) session; my_session->down = *downstream; } -static void setUpstream(FILTER *instance, void *session, UPSTREAM *upstream) +static void setUpstream(MXS_FILTER *instance, void *session, UPSTREAM *upstream) { MQ_SESSION *my_session = (MQ_SESSION *) session; my_session->up = *upstream; @@ -931,7 +931,7 @@ unsigned int pktlen(void* c) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { MQ_SESSION *my_session = (MQ_SESSION *) session; MQ_INSTANCE *my_instance = (MQ_INSTANCE *) instance; @@ -1346,7 +1346,7 @@ unsigned int is_eof(void* p) * @param session The filter session * @param reply The response data */ -static int clientReply(FILTER* instance, void *session, GWBUF *reply) +static int clientReply(MXS_FILTER* instance, void *session, GWBUF *reply) { MQ_SESSION *my_session = (MQ_SESSION *) session; MQ_INSTANCE *my_instance = (MQ_INSTANCE *) instance; @@ -1491,7 +1491,7 @@ static int clientReply(FILTER* instance, void *session, GWBUF *reply) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { MQ_INSTANCE *my_instance = (MQ_INSTANCE *) instance; diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.c b/server/modules/filter/namedserverfilter/namedserverfilter.c index 5873db6e5..63f372d06 100644 --- a/server/modules/filter/namedserverfilter/namedserverfilter.c +++ b/server/modules/filter/namedserverfilter/namedserverfilter.c @@ -40,13 +40,13 @@ * @endverbatim */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); /** @@ -146,7 +146,7 @@ MXS_MODULE* MXS_CREATE_MODULE() * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE*)MXS_MALLOC(sizeof(REGEXHINT_INSTANCE)); @@ -184,7 +184,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) } } - return (FILTER *) my_instance; + return (MXS_FILTER *) my_instance; } /** @@ -195,7 +195,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE *) instance; REGEXHINT_SESSION *my_session; @@ -233,7 +233,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { } @@ -244,7 +244,7 @@ closeSession(FILTER *instance, void *session) * @param session The session being closed */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { MXS_FREE(session); return; @@ -258,7 +258,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { REGEXHINT_SESSION *my_session = (REGEXHINT_SESSION *) session; my_session->down = *downstream; @@ -279,7 +279,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE *) instance; REGEXHINT_SESSION *my_session = (REGEXHINT_SESSION *) session; @@ -319,7 +319,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE *) instance; REGEXHINT_SESSION *my_session = (REGEXHINT_SESSION *) fsession; diff --git a/server/modules/filter/qlafilter/qlafilter.c b/server/modules/filter/qlafilter/qlafilter.c index e6a6a5ba7..572331fa0 100644 --- a/server/modules/filter/qlafilter/qlafilter.c +++ b/server/modules/filter/qlafilter/qlafilter.c @@ -73,13 +73,13 @@ enum log_options /* * The filter entry points */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); /** @@ -267,7 +267,7 @@ MXS_MODULE* MXS_CREATE_MODULE() * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { QLA_INSTANCE *my_instance = (QLA_INSTANCE*) MXS_MALLOC(sizeof(QLA_INSTANCE)); @@ -364,7 +364,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) my_instance = NULL; } } - return (FILTER *) my_instance; + return (MXS_FILTER *) my_instance; } /** @@ -377,7 +377,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { QLA_INSTANCE *my_instance = (QLA_INSTANCE *) instance; QLA_SESSION *my_session; @@ -448,7 +448,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { QLA_SESSION *my_session = (QLA_SESSION *) session; @@ -465,7 +465,7 @@ closeSession(FILTER *instance, void *session) * @param session The filter session */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { QLA_SESSION *my_session = (QLA_SESSION *) session; @@ -483,7 +483,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router. */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { QLA_SESSION *my_session = (QLA_SESSION *) session; @@ -501,7 +501,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { QLA_INSTANCE *my_instance = (QLA_INSTANCE *) instance; QLA_SESSION *my_session = (QLA_SESSION *) session; @@ -580,7 +580,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { QLA_INSTANCE *my_instance = (QLA_INSTANCE *) instance; QLA_SESSION *my_session = (QLA_SESSION *) fsession; diff --git a/server/modules/filter/regexfilter/regexfilter.c b/server/modules/filter/regexfilter/regexfilter.c index c3c2f9c17..5848986ac 100644 --- a/server/modules/filter/regexfilter/regexfilter.c +++ b/server/modules/filter/regexfilter/regexfilter.c @@ -40,13 +40,13 @@ * @endverbatim */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); static char *regex_replace(const char *sql, pcre2_code *re, pcre2_match_data *study, @@ -177,7 +177,7 @@ void free_instance(REGEX_INSTANCE *instance) * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { REGEX_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(REGEX_INSTANCE)); @@ -234,7 +234,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) } } - return (FILTER *) my_instance; + return (MXS_FILTER *) my_instance; } /** @@ -245,7 +245,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { REGEX_INSTANCE *my_instance = (REGEX_INSTANCE *) instance; REGEX_SESSION *my_session; @@ -283,7 +283,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { } @@ -294,7 +294,7 @@ closeSession(FILTER *instance, void *session) * @param session The session being closed */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { MXS_FREE(session); return; @@ -308,7 +308,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { REGEX_SESSION *my_session = (REGEX_SESSION *) session; my_session->down = *downstream; @@ -325,7 +325,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { REGEX_INSTANCE *my_instance = (REGEX_INSTANCE *) instance; REGEX_SESSION *my_session = (REGEX_SESSION *) session; @@ -376,7 +376,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { REGEX_INSTANCE *my_instance = (REGEX_INSTANCE *) instance; REGEX_SESSION *my_session = (REGEX_SESSION *) fsession; diff --git a/server/modules/filter/tee/tee.c b/server/modules/filter/tee/tee.c index cca16486d..28777489b 100644 --- a/server/modules/filter/tee/tee.c +++ b/server/modules/filter/tee/tee.c @@ -97,15 +97,15 @@ static unsigned char required_packets[] = /* * The filter entry points */ -static FILTER *createInstance(const char* name, char **options, CONFIG_PARAMETER *); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static void setUpstream(FILTER *instance, void *fsession, UPSTREAM *upstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static int clientReply(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char* name, char **options, CONFIG_PARAMETER *); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static void setUpstream(MXS_FILTER *instance, void *fsession, UPSTREAM *upstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static int clientReply(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); /** @@ -361,7 +361,7 @@ MXS_MODULE* MXS_CREATE_MODULE() * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { TEE_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(TEE_INSTANCE)); @@ -405,7 +405,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) } } - return (FILTER *) my_instance; + return (MXS_FILTER *) my_instance; } /** @@ -418,7 +418,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { TEE_INSTANCE *my_instance = (TEE_INSTANCE *) instance; TEE_SESSION *my_session; @@ -521,7 +521,7 @@ retblock: * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { TEE_SESSION *my_session = (TEE_SESSION *) session; ROUTER_OBJECT *router; @@ -579,7 +579,7 @@ closeSession(FILTER *instance, void *session) * @param session The filter session */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { TEE_SESSION *my_session = (TEE_SESSION *) session; SESSION* ses = my_session->branch_session; @@ -636,7 +636,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router. */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { TEE_SESSION *my_session = (TEE_SESSION *) session; my_session->down = *downstream; @@ -651,7 +651,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param downstream The downstream filter or router. */ static void -setUpstream(FILTER *instance, void *session, UPSTREAM *upstream) +setUpstream(MXS_FILTER *instance, void *session, UPSTREAM *upstream) { TEE_SESSION *my_session = (TEE_SESSION *) session; my_session->up = *upstream; @@ -676,7 +676,7 @@ setUpstream(FILTER *instance, void *session, UPSTREAM *upstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { TEE_INSTANCE *my_instance = (TEE_INSTANCE *) instance; TEE_SESSION *my_session = (TEE_SESSION *) session; @@ -696,7 +696,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue) * @param reply The response data */ static int -clientReply(FILTER* instance, void *session, GWBUF *reply) +clientReply(MXS_FILTER* instance, void *session, GWBUF *reply) { int rc = 1, branch, eof; TEE_SESSION *my_session = (TEE_SESSION *) session; @@ -718,7 +718,7 @@ clientReply(FILTER* instance, void *session, GWBUF *reply) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { TEE_INSTANCE *my_instance = (TEE_INSTANCE *) instance; TEE_SESSION *my_session = (TEE_SESSION *) fsession; diff --git a/server/modules/filter/testfilter/testfilter.c b/server/modules/filter/testfilter/testfilter.c index 865ded07b..c11406cf9 100644 --- a/server/modules/filter/testfilter/testfilter.c +++ b/server/modules/filter/testfilter/testfilter.c @@ -30,15 +30,15 @@ */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); -static void destroyInstance(FILTER *instance); +static void destroyInstance(MXS_FILTER *instance); @@ -116,7 +116,7 @@ MXS_MODULE* MXS_CREATE_MODULE() * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { TEST_INSTANCE *my_instance; @@ -126,7 +126,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) my_instance->sessions = 0; my_instance->name = name; } - return (FILTER *)my_instance; + return (MXS_FILTER *)my_instance; } /** @@ -137,7 +137,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { TEST_INSTANCE *my_instance = (TEST_INSTANCE *)instance; TEST_SESSION *my_session; @@ -159,7 +159,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { } @@ -170,7 +170,7 @@ closeSession(FILTER *instance, void *session) * @param session The session being closed */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { MXS_FREE(session); return; @@ -184,7 +184,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { TEST_SESSION *my_session = (TEST_SESSION *)session; @@ -202,7 +202,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { TEST_SESSION *my_session = (TEST_SESSION *)session; @@ -226,7 +226,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { TEST_INSTANCE *my_instance = (TEST_INSTANCE *)instance; TEST_SESSION *my_session = (TEST_SESSION *)fsession; @@ -254,7 +254,7 @@ static uint64_t getCapabilities(void) * * @param The filter instance. */ -static void destroyInstance(FILTER *instance) +static void destroyInstance(MXS_FILTER *instance) { TEST_INSTANCE *cinstance = (TEST_INSTANCE *)instance; diff --git a/server/modules/filter/topfilter/topfilter.c b/server/modules/filter/topfilter/topfilter.c index bcc5d2972..f336e0ccc 100644 --- a/server/modules/filter/topfilter/topfilter.c +++ b/server/modules/filter/topfilter/topfilter.c @@ -48,15 +48,15 @@ /* * The filter entry points */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static void setUpstream(FILTER *instance, void *fsession, UPSTREAM *upstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static int clientReply(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static void setUpstream(MXS_FILTER *instance, void *fsession, UPSTREAM *upstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static int clientReply(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); /** @@ -190,7 +190,7 @@ MXS_MODULE* MXS_CREATE_MODULE() * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { TOPN_INSTANCE *my_instance = (TOPN_INSTANCE*)MXS_MALLOC(sizeof(TOPN_INSTANCE)); @@ -251,7 +251,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) } } - return (FILTER *) my_instance; + return (MXS_FILTER *) my_instance; } /** @@ -264,7 +264,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { TOPN_INSTANCE *my_instance = (TOPN_INSTANCE *) instance; TOPN_SESSION *my_session; @@ -340,7 +340,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { TOPN_INSTANCE *my_instance = (TOPN_INSTANCE *) instance; TOPN_SESSION *my_session = (TOPN_SESSION *) session; @@ -408,7 +408,7 @@ closeSession(FILTER *instance, void *session) * @param session The filter session */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { TOPN_SESSION *my_session = (TOPN_SESSION *) session; @@ -426,7 +426,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router. */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { TOPN_SESSION *my_session = (TOPN_SESSION *) session; @@ -442,7 +442,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param upstream The upstream filter or session. */ static void -setUpstream(FILTER *instance, void *session, UPSTREAM *upstream) +setUpstream(MXS_FILTER *instance, void *session, UPSTREAM *upstream) { TOPN_SESSION *my_session = (TOPN_SESSION *) session; @@ -460,7 +460,7 @@ setUpstream(FILTER *instance, void *session, UPSTREAM *upstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { TOPN_INSTANCE *my_instance = (TOPN_INSTANCE *) instance; TOPN_SESSION *my_session = (TOPN_SESSION *) session; @@ -508,7 +508,7 @@ cmp_topn(const void *va, const void *vb) } static int -clientReply(FILTER *instance, void *session, GWBUF *reply) +clientReply(MXS_FILTER *instance, void *session, GWBUF *reply) { TOPN_INSTANCE *my_instance = (TOPN_INSTANCE *) instance; TOPN_SESSION *my_session = (TOPN_SESSION *) session; @@ -573,7 +573,7 @@ clientReply(FILTER *instance, void *session, GWBUF *reply) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { TOPN_INSTANCE *my_instance = (TOPN_INSTANCE *) instance; TOPN_SESSION *my_session = (TOPN_SESSION *) fsession; diff --git a/server/modules/filter/tpmfilter/tpmfilter.c b/server/modules/filter/tpmfilter/tpmfilter.c index 041e71cc7..d7135f95c 100644 --- a/server/modules/filter/tpmfilter/tpmfilter.c +++ b/server/modules/filter/tpmfilter/tpmfilter.c @@ -75,15 +75,15 @@ static const int default_sql_size = 4 * 1024; /* * The filter entry points */ -static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); -static void *newSession(FILTER *instance, SESSION *session); -static void closeSession(FILTER *instance, void *session); -static void freeSession(FILTER *instance, void *session); -static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); -static void setUpstream(FILTER *instance, void *fsession, UPSTREAM *upstream); -static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); -static int clientReply(FILTER *instance, void *fsession, GWBUF *queue); -static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); +static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); +static void *newSession(MXS_FILTER *instance, SESSION *session); +static void closeSession(MXS_FILTER *instance, void *session); +static void freeSession(MXS_FILTER *instance, void *session); +static void setDownstream(MXS_FILTER *instance, void *fsession, DOWNSTREAM *downstream); +static void setUpstream(MXS_FILTER *instance, void *fsession, UPSTREAM *upstream); +static int routeQuery(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static int clientReply(MXS_FILTER *instance, void *fsession, GWBUF *queue); +static void diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb); static uint64_t getCapabilities(void); static void checkNamedPipe(void *args); @@ -193,7 +193,7 @@ MXS_MODULE* MXS_CREATE_MODULE() * * @return The instance data for this new instance */ -static FILTER * +static MXS_FILTER * createInstance(const char *name, char **options, CONFIG_PARAMETER *params) { TPM_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(TPM_INSTANCE)); @@ -281,7 +281,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) } } - return(FILTER *)my_instance; + return(MXS_FILTER *)my_instance; } /** @@ -294,7 +294,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params) * @return Session specific data for this session */ static void * -newSession(FILTER *instance, SESSION *session) +newSession(MXS_FILTER *instance, SESSION *session) { TPM_INSTANCE *my_instance = (TPM_INSTANCE *)instance; TPM_SESSION *my_session; @@ -353,7 +353,7 @@ newSession(FILTER *instance, SESSION *session) * @param session The session being closed */ static void -closeSession(FILTER *instance, void *session) +closeSession(MXS_FILTER *instance, void *session) { TPM_SESSION *my_session = (TPM_SESSION *)session; TPM_INSTANCE *my_instance = (TPM_INSTANCE *)instance; @@ -372,7 +372,7 @@ closeSession(FILTER *instance, void *session) * @param session The filter session */ static void -freeSession(FILTER *instance, void *session) +freeSession(MXS_FILTER *instance, void *session) { TPM_SESSION *my_session = (TPM_SESSION *)session; @@ -392,7 +392,7 @@ freeSession(FILTER *instance, void *session) * @param downstream The downstream filter or router. */ static void -setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) +setDownstream(MXS_FILTER *instance, void *session, DOWNSTREAM *downstream) { TPM_SESSION *my_session = (TPM_SESSION *)session; @@ -408,7 +408,7 @@ setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) * @param upstream The upstream filter or session. */ static void -setUpstream(FILTER *instance, void *session, UPSTREAM *upstream) +setUpstream(MXS_FILTER *instance, void *session, UPSTREAM *upstream) { TPM_SESSION *my_session = (TPM_SESSION *)session; @@ -426,7 +426,7 @@ setUpstream(FILTER *instance, void *session, UPSTREAM *upstream) * @param queue The query data */ static int -routeQuery(FILTER *instance, void *session, GWBUF *queue) +routeQuery(MXS_FILTER *instance, void *session, GWBUF *queue) { TPM_INSTANCE *my_instance = (TPM_INSTANCE *)instance; TPM_SESSION *my_session = (TPM_SESSION *)session; @@ -516,7 +516,7 @@ retblock: } static int -clientReply(FILTER *instance, void *session, GWBUF *reply) +clientReply(MXS_FILTER *instance, void *session, GWBUF *reply) { TPM_INSTANCE *my_instance = (TPM_INSTANCE *)instance; TPM_SESSION *my_session = (TPM_SESSION *)session; @@ -572,7 +572,7 @@ clientReply(FILTER *instance, void *session, GWBUF *reply) * @param dcb The DCB for diagnostic output */ static void -diagnostic(FILTER *instance, void *fsession, DCB *dcb) +diagnostic(MXS_FILTER *instance, void *fsession, DCB *dcb) { TPM_INSTANCE *my_instance = (TPM_INSTANCE *)instance; TPM_SESSION *my_session = (TPM_SESSION *)fsession;