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

Change int to int32_t in plugin interfaces

Browse Source 
Better to use types whose size is unquestionably unambiguous
in plugin interfaces.

As on current platforms sizeof(int32_t) == sizeof(int) plugins
need not immediately be changed to return int32_t:s instead of
int:s.
This commit is contained in:
Johan Wikman
2017-01-13 09:44:41 +02:00
parent 196d4ad840
commit 6248d2bb9f
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/maxscale/filter.h
View File

@ -63,19 +63,19 @@ typedef void *FILTER;
*/ */
typedef struct filter_object typedef struct filter_object
{ {
FILTER *(*createInstance)(const char *name, FILTER *(*createInstance)(const char *name,
char **options, char **options,
CONFIG_PARAMETER *params); CONFIG_PARAMETER *params);
void *(*newSession)(FILTER *instance, SESSION *session); void *(*newSession)(FILTER *instance, SESSION *session);
void (*closeSession)(FILTER *instance, void *fsession); void (*closeSession)(FILTER *instance, void *fsession);
void (*freeSession)(FILTER *instance, void *fsession); void (*freeSession)(FILTER *instance, void *fsession);
void (*setDownstream)(FILTER *instance, void *fsession, DOWNSTREAM *downstream); void (*setDownstream)(FILTER *instance, void *fsession, DOWNSTREAM *downstream);
void (*setUpstream)(FILTER *instance, void *fsession, UPSTREAM *downstream); void (*setUpstream)(FILTER *instance, void *fsession, UPSTREAM *downstream);
int (*routeQuery)(FILTER *instance, void *fsession, GWBUF *queue); int32_t (*routeQuery)(FILTER *instance, void *fsession, GWBUF *queue);
int (*clientReply)(FILTER *instance, void *fsession, GWBUF *queue); int32_t (*clientReply)(FILTER *instance, void *fsession, GWBUF *queue);
void (*diagnostics)(FILTER *instance, void *fsession, DCB *dcb); void (*diagnostics)(FILTER *instance, void *fsession, DCB *dcb);
uint64_t (*getCapabilities)(void); uint64_t (*getCapabilities)(void);
void (*destroyInstance)(FILTER *instance); void (*destroyInstance)(FILTER *instance);
} FILTER_OBJECT; } FILTER_OBJECT;
/** /**

26
include/maxscale/protocol.h
View File

@ -52,19 +52,19 @@ struct session;
*/ */
typedef struct mxs_protocol typedef struct mxs_protocol
{ {
int (*read)(struct dcb *); int32_t (*read)(struct dcb *);
int (*write)(struct dcb *, GWBUF *); int32_t (*write)(struct dcb *, GWBUF *);
int (*write_ready)(struct dcb *); int32_t (*write_ready)(struct dcb *);
int (*error)(struct dcb *); int32_t (*error)(struct dcb *);
int (*hangup)(struct dcb *); int32_t (*hangup)(struct dcb *);
int (*accept)(struct dcb *); int32_t (*accept)(struct dcb *);
int (*connect)(struct dcb *, struct server *, struct session *); int32_t (*connect)(struct dcb *, struct server *, struct session *);
int (*close)(struct dcb *); int32_t (*close)(struct dcb *);
int (*listen)(struct dcb *, char *); int32_t (*listen)(struct dcb *, char *);
int (*auth)(struct dcb *, struct server *, struct session *, GWBUF *); int32_t (*auth)(struct dcb *, struct server *, struct session *, GWBUF *);
int (*session)(struct dcb *, void *); int32_t (*session)(struct dcb *, void *);
char *(*auth_default)(); char *(*auth_default)();
int (*connlimit)(struct dcb *, int limit); int32_t (*connlimit)(struct dcb *, int limit);
} MXS_PROTOCOL; } MXS_PROTOCOL;
/** /**

18
include/maxscale/router.h
View File

@ -69,21 +69,21 @@ typedef enum error_action
*/ */
typedef struct router_object typedef struct router_object
{ {
ROUTER *(*createInstance)(SERVICE *service, char **options); ROUTER *(*createInstance)(SERVICE *service, char **options);
void *(*newSession)(ROUTER *instance, SESSION *session); void *(*newSession)(ROUTER *instance, SESSION *session);
void (*closeSession)(ROUTER *instance, void *router_session); void (*closeSession)(ROUTER *instance, void *router_session);
void (*freeSession)(ROUTER *instance, void *router_session); void (*freeSession)(ROUTER *instance, void *router_session);
int (*routeQuery)(ROUTER *instance, void *router_session, GWBUF *queue); int32_t (*routeQuery)(ROUTER *instance, void *router_session, GWBUF *queue);
void (*diagnostics)(ROUTER *instance, DCB *dcb); void (*diagnostics)(ROUTER *instance, DCB *dcb);
void (*clientReply)(ROUTER* instance, void* router_session, GWBUF* queue, DCB *backend_dcb); void (*clientReply)(ROUTER* instance, void* router_session, GWBUF* queue, DCB *backend_dcb);
void (*handleError)(ROUTER* instance, void (*handleError)(ROUTER* instance,
void* router_session, void* router_session,
GWBUF* errmsgbuf, GWBUF* errmsgbuf,
DCB* backend_dcb, DCB* backend_dcb,
error_action_t action, error_action_t action,
bool* succp); bool* succp);
uint64_t (*getCapabilities)(void); uint64_t (*getCapabilities)(void);
void (*destroyInstance)(ROUTER *instance); void (*destroyInstance)(ROUTER *instance);
} ROUTER_OBJECT; } ROUTER_OBJECT;
/** /**