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

Rename public types and constants in session.h

Browse Source 
Preparing to split session.h into module and core sections.
This commit is contained in:
Esa Korhonen
2017-01-17 15:02:39 +02:00
parent 680401cf8e
commit fb771c8a2e
56 changed files with 241 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/filter/cache/cache.cc vendored
View File

@ -107,7 +107,7 @@ bool Cache::should_store(const char* zDefaultDb, const GWBUF* pQuery)
return m_sRules->should_store(zDefaultDb, pQuery);
}
bool Cache::should_use(const SESSION* pSession)
bool Cache::should_use(const MXS_SESSION* pSession)
{
return m_sRules->should_use(pSession);
}

2
server/modules/filter/cache/cache.hh vendored
View File

@ -66,7 +66,7 @@ public:
*
* @return True of cached results should be used.
*/
bool should_use(const SESSION* pSession);
bool should_use(const MXS_SESSION* pSession);
/**
* Specifies whether a particular SessioCache should refresh the data.

2
server/modules/filter/cache/cachefilter.cc vendored
View File

@ -260,7 +260,7 @@ CacheFilter* CacheFilter::create(const char* zName, char** pzOptions, CONFIG_PAR
return pFilter;
}
CacheFilterSession* CacheFilter::newSession(SESSION* pSession)
CacheFilterSession* CacheFilter::newSession(MXS_SESSION* pSession)
{
return CacheFilterSession::Create(m_sCache.get(), pSession);
}

2
server/modules/filter/cache/cachefilter.hh vendored
View File

@ -35,7 +35,7 @@ public:
return *m_sCache.get();
}
CacheFilterSession* newSession(SESSION* pSession);
CacheFilterSession* newSession(MXS_SESSION* pSession);
void diagnostics(DCB* pDcb);

6
server/modules/filter/cache/cachefiltersession.cc vendored
View File

@ -34,7 +34,7 @@ inline bool cache_max_resultset_size_exceeded(const CACHE_CONFIG& config, uint64
}
CacheFilterSession::CacheFilterSession(SESSION* pSession, Cache* pCache, char* zDefaultDb)
CacheFilterSession::CacheFilterSession(MXS_SESSION* pSession, Cache* pCache, char* zDefaultDb)
: maxscale::FilterSession(pSession)
, m_state(CACHE_EXPECTING_NOTHING)
, m_pCache(pCache)
@ -54,7 +54,7 @@ CacheFilterSession::~CacheFilterSession()
}
//static
CacheFilterSession* CacheFilterSession::Create(Cache* pCache, SESSION* pSession)
CacheFilterSession* CacheFilterSession::Create(Cache* pCache, MXS_SESSION* pSession)
{
CacheFilterSession* pCacheFilterSession = NULL;
@ -136,7 +136,7 @@ int CacheFilterSession::routeQuery(GWBUF* pPacket)
// possible.
if (qc_get_operation(pPacket) == QUERY_OP_SELECT)
{
SESSION *session = m_pSession;
MXS_SESSION *session = m_pSession;
if ((session_is_autocommit(session) && !session_trx_is_active(session)) ||
session_trx_is_read_only(session))

4
server/modules/filter/cache/cachefiltersession.hh vendored
View File

@ -58,7 +58,7 @@ public:
*
* @return A new instance or NULL if memory allocation fails.
*/
static CacheFilterSession* Create(Cache* pCache, SESSION* pSession);
static CacheFilterSession* Create(Cache* pCache, MXS_SESSION* pSession);
/**
* The session has been closed.
@ -106,7 +106,7 @@ private:
void store_result();
private:
CacheFilterSession(SESSION* pSession, Cache* pCache, char* zDefaultDb);
CacheFilterSession(MXS_SESSION* pSession, Cache* pCache, char* zDefaultDb);
CacheFilterSession(const CacheFilterSession&);
CacheFilterSession& operator = (const CacheFilterSession&);

8
server/modules/filter/cache/rules.cc vendored
View File

@ -321,13 +321,13 @@ bool cache_rules_should_store(CACHE_RULES *self, const char *default_db, const G
return should_store;
}
bool cache_rules_should_use(CACHE_RULES *self, const SESSION *session)
bool cache_rules_should_use(CACHE_RULES *self, const MXS_SESSION *session)
{
bool should_use = false;
CACHE_RULE *rule = self->use_rules;
const char *user = session_get_user((SESSION*)session);
const char *host = session_get_remote((SESSION*)session);
const char *user = session_get_user((MXS_SESSION*)session);
const char *host = session_get_remote((MXS_SESSION*)session);
if (!user)
{
@ -409,7 +409,7 @@ bool CacheRules::should_store(const char* zdefault_db, const GWBUF* pquery) cons
return cache_rules_should_store(prules_, zdefault_db, pquery);
}
bool CacheRules::should_use(const SESSION* psession) const
bool CacheRules::should_use(const MXS_SESSION* psession) const
{
return cache_rules_should_use(prules_, psession);
}

4
server/modules/filter/cache/rules.h vendored
View File

@ -152,7 +152,7 @@ bool cache_rules_should_store(CACHE_RULES *rules, const char *default_db, const
*
* @return True, if the cache should be used.
*/
bool cache_rules_should_use(CACHE_RULES *rules, const SESSION *session);
bool cache_rules_should_use(CACHE_RULES *rules, const MXS_SESSION *session);
MXS_END_DECLS
@ -209,7 +209,7 @@ public:
*
* @return True, if the cache should be used.
*/
bool should_use(const SESSION* psession) const;
bool should_use(const MXS_SESSION* psession) const;
private:
CacheRules(CACHE_RULES* prules);

4
server/modules/filter/ccrfilter/ccrfilter.c
View File

@ -50,7 +50,7 @@
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -226,7 +226,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
CCR_INSTANCE *my_instance = (CCR_INSTANCE *)instance;
CCR_SESSION *my_session = MXS_MALLOC(sizeof(CCR_SESSION));

6
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -96,7 +96,7 @@ int dbfw_yyparse(void*);
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -261,7 +261,7 @@ typedef struct
*/
typedef struct
{
SESSION *session; /*< Client session structure */
MXS_SESSION *session; /*< Client session structure */
char *errmsg; /*< Rule specific error message */
QUERYSPEED *query_speed; /*< How fast the user has executed queries */
MXS_DOWNSTREAM down; /*< Next object in the downstream chain */
@ -1599,7 +1599,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
FW_SESSION *my_session;

4
server/modules/filter/hintfilter/hintfilter.c
View File

@ -27,7 +27,7 @@
*/
static MXS_FILTER *createInstance(const char* name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -110,7 +110,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
HINT_INSTANCE *my_instance = (HINT_INSTANCE *)instance;
HINT_SESSION *my_session;

4
server/modules/filter/insertstream/insertstream.c
View File

@ -31,7 +31,7 @@
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER*params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -176,7 +176,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
DS_INSTANCE *my_instance = (DS_INSTANCE *) instance;
DS_SESSION *my_session;

2
server/modules/filter/masking/maskingfilter.cc
View File

@ -133,7 +133,7 @@ MaskingFilter* MaskingFilter::create(const char* zName, char** pzOptions, CONFIG
}
MaskingFilterSession* MaskingFilter::newSession(SESSION* pSession)
MaskingFilterSession* MaskingFilter::newSession(MXS_SESSION* pSession)
{
return MaskingFilterSession::create(pSession, this);
}

2
server/modules/filter/masking/maskingfilter.hh
View File

@ -31,7 +31,7 @@ public:
~MaskingFilter();
static MaskingFilter* create(const char* zName, char** pzOptions, CONFIG_PARAMETER* ppParams);
MaskingFilterSession* newSession(SESSION* pSession);
MaskingFilterSession* newSession(MXS_SESSION* pSession);
void diagnostics(DCB* pDcb);

4
server/modules/filter/masking/maskingfiltersession.cc
View File

@ -25,7 +25,7 @@ using std::ostream;
using std::string;
using std::stringstream;
MaskingFilterSession::MaskingFilterSession(SESSION* pSession, const MaskingFilter* pFilter)
MaskingFilterSession::MaskingFilterSession(MXS_SESSION* pSession, const MaskingFilter* pFilter)
: maxscale::FilterSession(pSession)
, m_filter(*pFilter)
, m_state(IGNORING_RESPONSE)
@ -37,7 +37,7 @@ MaskingFilterSession::~MaskingFilterSession()
}
//static
MaskingFilterSession* MaskingFilterSession::create(SESSION* pSession, const MaskingFilter* pFilter)
MaskingFilterSession* MaskingFilterSession::create(MXS_SESSION* pSession, const MaskingFilter* pFilter)
{
return new MaskingFilterSession(pSession, pFilter);
}

4
server/modules/filter/masking/maskingfiltersession.hh
View File

@ -29,14 +29,14 @@ public:
~MaskingFilterSession();
static MaskingFilterSession* create(SESSION* pSession, const MaskingFilter* pFilter);
static MaskingFilterSession* create(MXS_SESSION* pSession, const MaskingFilter* pFilter);
int routeQuery(GWBUF* pPacket);
int clientReply(GWBUF* pPacket);
private:
MaskingFilterSession(SESSION* pSession, const MaskingFilter* pFilter);
MaskingFilterSession(MXS_SESSION* pSession, const MaskingFilter* pFilter);
MaskingFilterSession(const MaskingFilterSession&);
MaskingFilterSession& operator = (const MaskingFilterSession&);

10
server/modules/filter/maxrows/maxrows.c
View File

@ -47,7 +47,7 @@
#include "maxrows.h"
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *sdata);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *sdata);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *sdata, MXS_DOWNSTREAM *downstream);
@ -157,13 +157,13 @@ typedef struct maxrows_session_data
MXS_DOWNSTREAM down; /**< The previous filter or equivalent. */
MXS_UPSTREAM up; /**< The next filter or equivalent. */
MAXROWS_RESPONSE_STATE res; /**< The response state. */
SESSION *session; /**< The session this data is associated with. */
MXS_SESSION *session; /**< The session this data is associated with. */
maxrows_session_state_t state;
bool large_packet; /**< Large packet (> 16MB)) indicator */
bool discard_resultset; /**< Discard resultset indicator */
} MAXROWS_SESSION_DATA;
static MAXROWS_SESSION_DATA *maxrows_session_data_create(MAXROWS_INSTANCE *instance, SESSION *session);
static MAXROWS_SESSION_DATA *maxrows_session_data_create(MAXROWS_INSTANCE *instance, MXS_SESSION *session);
static void maxrows_session_data_free(MAXROWS_SESSION_DATA *data);
static int handle_expecting_fields(MAXROWS_SESSION_DATA *csdata);
@ -211,7 +211,7 @@ static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAM
*
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session)
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
MAXROWS_INSTANCE *cinstance = (MAXROWS_INSTANCE*)instance;
MAXROWS_SESSION_DATA *csdata = maxrows_session_data_create(cinstance, session);
@ -448,7 +448,7 @@ static void maxrows_response_state_reset(MAXROWS_RESPONSE_STATE *state)
* @return Session data or NULL if creation fails.
*/
static MAXROWS_SESSION_DATA *maxrows_session_data_create(MAXROWS_INSTANCE *instance,
SESSION* session)
MXS_SESSION* session)
{
MAXROWS_SESSION_DATA *data = (MAXROWS_SESSION_DATA*)MXS_CALLOC(1, sizeof(MAXROWS_SESSION_DATA));

4
server/modules/filter/namedserverfilter/namedserverfilter.c
View File

@ -43,7 +43,7 @@
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -197,7 +197,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE *) instance;
REGEXHINT_SESSION *my_session;

4
server/modules/filter/qlafilter/qlafilter.c
View File

@ -76,7 +76,7 @@ enum log_options
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -379,7 +379,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
QLA_INSTANCE *my_instance = (QLA_INSTANCE *) instance;
QLA_SESSION *my_session;

4
server/modules/filter/regexfilter/regexfilter.c
View File

@ -43,7 +43,7 @@
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -247,7 +247,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
REGEX_INSTANCE *my_instance = (REGEX_INSTANCE *) instance;
REGEX_SESSION *my_session;

22
server/modules/filter/tee/tee.c
View File

@ -100,7 +100,7 @@ static unsigned char required_packets[] =
* The filter entry points
*/
static MXS_FILTER *createInstance(const char* name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -147,7 +147,7 @@ typedef struct
int replies[2]; /* Number of queries received */
int reply_packets[2]; /* Number of OK, ERR, LOCAL_INFILE_REQUEST or RESULT_SET packets received */
DCB *branch_dcb; /* Client DCB for "branch" service */
SESSION *branch_session; /* The branch service session */
MXS_SESSION *branch_session; /* The branch service session */
TEE_INSTANCE *instance;
int n_duped; /* Number of duplicated queries */
int n_rejected; /* Number of rejected queries */
@ -165,7 +165,7 @@ typedef struct
typedef struct orphan_session_tt
{
SESSION* session; /*< The child branch session whose parent was freed before
MXS_SESSION* session; /*< The child branch session whose parent was freed before
* the child session was in a suitable state. */
struct orphan_session_tt* next;
} orphan_session_t;
@ -187,7 +187,7 @@ int route_single_query(TEE_INSTANCE* my_instance,
GWBUF* buffer,
GWBUF* clone);
int reset_session_state(TEE_SESSION* my_session, GWBUF* buffer);
void create_orphan(SESSION* ses);
void create_orphan(MXS_SESSION* ses);
static void
orphan_free(void* data)
@ -419,7 +419,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
TEE_INSTANCE *my_instance = (TEE_INSTANCE *) instance;
TEE_SESSION *my_session;
@ -479,7 +479,7 @@ newSession(MXS_FILTER *instance, SESSION *session)
if (my_session->active)
{
DCB* dcb;
SESSION* ses;
MXS_SESSION* ses;
if ((dcb = dcb_clone(session->client_dcb)) == NULL)
{
freeSession(instance, (MXS_FILTER_SESSION *) my_session);
@ -527,7 +527,7 @@ closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session)
TEE_SESSION *my_session = (TEE_SESSION *) session;
ROUTER_OBJECT *router;
void *router_instance, *rsession;
SESSION *bsession;
MXS_SESSION *bsession;
#ifdef SS_DEBUG
MXS_INFO("Tee close: %d", atomic_add(&debug_seq, 1));
#endif
@ -583,8 +583,8 @@ static void
freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session)
{
TEE_SESSION *my_session = (TEE_SESSION *) session;
SESSION* ses = my_session->branch_session;
session_state_t state;
MXS_SESSION* ses = my_session->branch_session;
mxs_session_state_t state;
#ifdef SS_DEBUG
MXS_INFO("Tee free: %d", atomic_add(&debug_seq, 1));
#endif
@ -892,7 +892,7 @@ int route_single_query(TEE_INSTANCE* my_instance, TEE_SESSION* my_session, GWBUF
if (my_session->branch_session->state == SESSION_STATE_ROUTER_READY)
{
SESSION_ROUTE_QUERY(my_session->branch_session, clone);
MXS_SESSION_ROUTE_QUERY(my_session->branch_session, clone);
}
else
{
@ -950,7 +950,7 @@ int reset_session_state(TEE_SESSION* my_session, GWBUF* buffer)
return 1;
}
void create_orphan(SESSION* ses)
void create_orphan(MXS_SESSION* ses)
{
orphan_session_t* orphan = MXS_MALLOC(sizeof(orphan_session_t));
if (orphan)

4
server/modules/filter/testfilter/testfilter.c
View File

@ -31,7 +31,7 @@
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -137,7 +137,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
TEST_INSTANCE *my_instance = (TEST_INSTANCE *)instance;
TEST_SESSION *my_session;

4
server/modules/filter/topfilter/topfilter.c
View File

@ -51,7 +51,7 @@
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -266,7 +266,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
TOPN_INSTANCE *my_instance = (TOPN_INSTANCE *) instance;
TOPN_SESSION *my_session;

4
server/modules/filter/tpmfilter/tpmfilter.c
View File

@ -78,7 +78,7 @@ static const int default_sql_size = 4 * 1024;
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -296,7 +296,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @return Session specific data for this session
*/
static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session)
newSession(MXS_FILTER *instance, MXS_SESSION *session)
{
TPM_INSTANCE *my_instance = (TPM_INSTANCE *)instance;
TPM_SESSION *my_session;