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

Replace getCapabilities() with getCapabilities(void)

Browse Source 
The latter means no args, the former means any args.
This commit is contained in:
Johan Wikman 2016-10-21 20:59:30 +03:00
parent 59a4152d8a
commit db2cccbd8f
26 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/filter.h
View File

@ -84,7 +84,7 @@ typedef struct filter_object
int (*routeQuery)(FILTER *instance, void *fsession, GWBUF *queue);
int (*clientReply)(FILTER *instance, void *fsession, GWBUF *queue);
void (*diagnostics)(FILTER *instance, void *fsession, DCB *dcb);
uint64_t (*getCapabilities)();
uint64_t (*getCapabilities)(void);
} FILTER_OBJECT;
/**

2
include/maxscale/router.h
View File

@ -83,7 +83,7 @@ typedef struct router_object
DCB* backend_dcb,
error_action_t action,
bool* succp);
uint64_t (*getCapabilities)();
uint64_t (*getCapabilities)(void);
} ROUTER_OBJECT;
/**

4
server/modules/filter/cache/cache.c vendored
View File

@ -35,7 +35,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
#define C_DEBUG(format, ...) MXS_LOG_MESSAGE(LOG_NOTICE, format, ##__VA_ARGS__)
@ -558,7 +558,7 @@ static void diagnostics(FILTER *instance, void *sdata, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -63,7 +63,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
@ -420,7 +420,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -105,7 +105,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
{
@ -2335,7 +2335,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -89,7 +89,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static bool read_stored_data(GK_INSTANCE *inst);
static bool write_stored_data(GK_INSTANCE *inst);
@ -430,7 +430,7 @@ static void diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -40,7 +40,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
@ -286,7 +286,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -81,7 +81,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
@ -597,7 +597,7 @@ static void diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -101,7 +101,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
@ -1711,7 +1711,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -57,7 +57,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
@ -418,7 +418,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -72,7 +72,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
@ -522,7 +522,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -57,7 +57,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static char *regex_replace(const char *sql, pcre2_code *re, pcre2_match_data *study,
const char *replace);
@ -553,7 +553,7 @@ void log_nomatch(REGEX_INSTANCE* inst, char* re, char* old)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -116,7 +116,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
{
@ -1131,7 +1131,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -46,7 +46,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
@ -254,7 +254,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_NONE;
}

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

@ -67,7 +67,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
@ -690,7 +690,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

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

@ -81,7 +81,7 @@ 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 uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static FILTER_OBJECT MyObject =
{
@ -565,7 +565,7 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

3
server/modules/protocol/MySQL/MySQLClient/mysql_client.c
View File

@ -838,8 +838,7 @@ gw_read_normal_data(DCB *dcb, GWBUF *read_buffer, int nbytes_read)
}
/** Ask what type of input the router expects */
capabilities = session->service->router->getCapabilities(
session->service->router_instance, session->router_session);
capabilities = session->service->router->getCapabilities();
/** Update the current protocol command being executed */
if (!process_client_commands(dcb, nbytes_read, &read_buffer))

4
server/modules/routing/avro/avro.c
View File

@ -79,7 +79,7 @@ static void clientReply(ROUTER *instance, void *router_session, GWBUF *queue,
DCB *backend_dcb);
static void errorReply(ROUTER *instance, void *router_session, GWBUF *message,
DCB *backend_dcb, error_action_t action, bool *succp);
static uint64_t getCapabilities();
static uint64_t getCapabilities(void);
extern int MaxScaleUptime();
extern void avro_get_used_tables(AVRO_INSTANCE *router, DCB *dcb);
void converter_func(void* data);
@ -955,7 +955,7 @@ errorReply(ROUTER *instance, void *router_session, GWBUF *message, DCB *backend_
ss_dassert(false);
}
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_NO_RSESSION;
}

4
server/modules/routing/binlog/blr.c
View File

@ -100,7 +100,7 @@ static void errorReply(ROUTER *instance,
error_action_t action,
bool *succp);
static uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static int blr_handler_config(void *userdata, const char *section, const char *name, const char *value);
static int blr_handle_config_item(const char *name, const char *value, ROUTER_INSTANCE *inst);
static int blr_load_dbusers(const ROUTER_INSTANCE *router);
@ -1766,7 +1766,7 @@ static void rses_end_locked_router_action(ROUTER_SLAVE *rses)
}
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_NO_RSESSION;
}

4
server/modules/routing/cli/cli.c
View File

@ -58,7 +58,7 @@ static void closeSession(ROUTER *instance, void *router_session);
static void freeSession(ROUTER *instance, void *router_session);
static int execute(ROUTER *instance, void *router_session, GWBUF *queue);
static void diagnostics(ROUTER *instance, DCB *dcb);
static uint64_t getCapabilities();
static uint64_t getCapabilities(void);
/** The module object definition */
static ROUTER_OBJECT MyObject =
@ -302,7 +302,7 @@ diagnostics(ROUTER *instance, DCB *dcb)
return; /* Nothing to do currently */
}
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return 0;
}

2
server/modules/routing/debugcli/debugcli.c
View File

@ -333,7 +333,7 @@ diagnostics(ROUTER *instance, DCB *dcb)
return; /* Nothing to do currently */
}
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return 0;
}

4
server/modules/routing/maxinfo/maxinfo.c
View File

@ -77,7 +77,7 @@ static void closeSession(ROUTER *instance, void *router_session);
static void freeSession(ROUTER *instance, void *router_session);
static int execute(ROUTER *instance, void *router_session, GWBUF *queue);
static void diagnostics(ROUTER *instance, DCB *dcb);
static uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static void handleError(ROUTER *instance,
void *router_session,
GWBUF *errbuf,
@ -401,7 +401,7 @@ diagnostics(ROUTER *instance, DCB *dcb)
* Not used for the maxinfo router
*/
static uint64_t
getCapabilities()
getCapabilities(void)
{
return 0;
}

4
server/modules/routing/readconnroute/readconnroute.c
View File

@ -111,7 +111,7 @@ static void clientReply(ROUTER *instance, void *router_session, GWBUF *queue,
DCB *backend_dcb);
static void handleError(ROUTER *instance, void *router_session, GWBUF *errbuf,
DCB *problem_dcb, error_action_t action, bool *succp);
static uint64_t getCapabilities();
static uint64_t getCapabilities(void);
/** The module object definition */
@ -985,7 +985,7 @@ static void rses_end_locked_router_action(ROUTER_CLIENT_SES* rses)
spinlock_release(&rses->rses_lock);
}
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_NONE;
}

4
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -82,7 +82,7 @@ static void clientReply(ROUTER *instance, void *router_session, GWBUF *queue,
static void handleError(ROUTER *instance, void *router_session,
GWBUF *errmsgbuf, DCB *backend_dcb,
error_action_t action, bool *succp);
static uint64_t getCapabilities();
static uint64_t getCapabilities(void);
/*
* End of the API functions; now the module structure that links to them.
@ -1062,7 +1062,7 @@ lock_failed:
*
* @return RCAP_TYPE_STMT_INPUT.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

4
server/modules/routing/schemarouter/schemarouter.c
View File

@ -92,7 +92,7 @@ static route_target_t get_shard_route_target(qc_query_type_t qtype,
bool trx_active,
HINT* hint);
static uint64_t getCapabilities();
static uint64_t getCapabilities(void);
static bool connect_backend_servers(backend_ref_t* backend_ref,
int router_nservers,
@ -3642,7 +3642,7 @@ static void tracelog_routed_query(ROUTER_CLIENT_SES* rses,
/**
* Return RCAP_TYPE_STMT_INPUT.
*/
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return RCAP_TYPE_STMT_INPUT;
}

2
server/modules/routing/testroute/testroute.c
View File

@ -164,7 +164,7 @@ diagnostic(ROUTER *instance, DCB *dcb)
{
}
static uint64_t getCapabilities()
static uint64_t getCapabilities(void)
{
return 0;
}