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

Rename UPSTREAM to MXS_UPSTREAM

Browse Source 
And DOWNSTREAM to MXS_DOWNSTREAM
This commit is contained in:
Johan Wikman
2017-01-13 13:40:03 +02:00
parent 356690c0e5
commit 424849a9a2
20 changed files with 100 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/config.c
View File

@ -66,6 +66,7 @@
#include <maxscale/utils.h>
#include <maxscale/gwdirs.h>
#include "maxscale/filter.h"
#include "maxscale/service.h"
typedef struct duplicate_context

16
server/core/filter.c
View File

@ -399,12 +399,12 @@ bool filter_load(FILTER_DEF* filter)
* @return The downstream component for the next filter or NULL
* if the filter could not be created
*/
DOWNSTREAM *
filter_apply(FILTER_DEF *filter, SESSION *session, DOWNSTREAM *downstream)
MXS_DOWNSTREAM *
filter_apply(FILTER_DEF *filter, SESSION *session, MXS_DOWNSTREAM *downstream)
{
DOWNSTREAM *me;
MXS_DOWNSTREAM *me;
if ((me = (DOWNSTREAM *)MXS_CALLOC(1, sizeof(DOWNSTREAM))) == NULL)
if ((me = (MXS_DOWNSTREAM *)MXS_CALLOC(1, sizeof(MXS_DOWNSTREAM))) == NULL)
{
return NULL;
}
@ -434,10 +434,10 @@ filter_apply(FILTER_DEF *filter, SESSION *session, DOWNSTREAM *downstream)
* @param upstream The filter that should be upstream of this filter
* @return The upstream component for the next filter
*/
UPSTREAM *
filter_upstream(FILTER_DEF *filter, void *fsession, UPSTREAM *upstream)
MXS_UPSTREAM *
filter_upstream(FILTER_DEF *filter, void *fsession, MXS_UPSTREAM *upstream)
{
UPSTREAM *me = NULL;
MXS_UPSTREAM *me = NULL;
/*
* The the filter has no setUpstream entry point then is does
@ -450,7 +450,7 @@ filter_upstream(FILTER_DEF *filter, void *fsession, UPSTREAM *upstream)
if (filter->obj->clientReply != NULL)
{
if ((me = (UPSTREAM *)MXS_CALLOC(1, sizeof(UPSTREAM))) == NULL)
if ((me = (MXS_UPSTREAM *)MXS_CALLOC(1, sizeof(MXS_UPSTREAM))) == NULL)
{
return NULL;
}

4
server/core/maxscale/filter.h
View File

@ -23,10 +23,10 @@ MXS_BEGIN_DECLS
void filter_add_option(FILTER_DEF *filter_def, const char *option);
void filter_add_parameter(FILTER_DEF *filter_def, const char *name, const char *value);
FILTER_DEF *filter_alloc(const char *name, const char *module_name);
DOWNSTREAM *filter_apply(FILTER_DEF *filte_def, SESSION *session, DOWNSTREAM *downstream);
MXS_DOWNSTREAM *filter_apply(FILTER_DEF *filter_def, SESSION *session, MXS_DOWNSTREAM *downstream);
void filter_free(FILTER_DEF *filter_def);
bool filter_load(FILTER_DEF *filter_def);
int filter_standard_parameter(const char *name);
UPSTREAM *filter_upstream(FILTER_DEF *filter_def, void *fsession, UPSTREAM *upstream);
MXS_UPSTREAM *filter_upstream(FILTER_DEF *filter_def, void *fsession, MXS_UPSTREAM *upstream);
MXS_END_DECLS

4
server/core/session.c
View File

@ -627,8 +627,8 @@ static int
session_setup_filters(SESSION *session)
{
SERVICE *service = session->service;
DOWNSTREAM *head;
UPSTREAM *tail;
MXS_DOWNSTREAM *head;
MXS_UPSTREAM *tail;
int i;
if ((session->filters = MXS_CALLOC(service->n_filters,