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

Make filter const correct and use snake case

Browse Source 
CamelCase is still in use with the printing functions.
This commit is contained in:
Johan Wikman
2016-11-30 15:19:14 +02:00
parent b3e31a3da2
commit a6df875495
6 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/maxscale/filter.h
View File

@ -109,17 +109,17 @@ typedef struct filter_def
struct filter_def *next; /**< Next filter in the chain of all filters */ struct filter_def *next; /**< Next filter in the chain of all filters */
} FILTER_DEF; } FILTER_DEF;
FILTER_DEF *filter_alloc(char *, char *); FILTER_DEF *filter_alloc(const char *, const char *);
void filter_free(FILTER_DEF *); void filter_free(FILTER_DEF *);
bool filter_load(FILTER_DEF* filter); bool filter_load(FILTER_DEF* filter);
FILTER_DEF *filter_find(char *); FILTER_DEF *filter_find(const char *);
void filterAddOption(FILTER_DEF *, char *); void filter_add_option(FILTER_DEF *, const char *);
void filterAddParameter(FILTER_DEF *, char *, char *); void filter_add_parameter(FILTER_DEF *, const char *, const char *);
DOWNSTREAM *filterApply(FILTER_DEF *, SESSION *, DOWNSTREAM *); DOWNSTREAM *filter_apply(FILTER_DEF *, SESSION *, DOWNSTREAM *);
UPSTREAM *filterUpstream(FILTER_DEF *, void *, UPSTREAM *); UPSTREAM *filter_upstream(FILTER_DEF *, void *, UPSTREAM *);
int filter_standard_parameter(char *); int filter_standard_parameter(const char *);
void dprintAllFilters(DCB *); void dprintAllFilters(DCB *);
void dprintFilter(DCB *, FILTER_DEF *); void dprintFilter(DCB *, const FILTER_DEF *);
void dListFilters(DCB *); void dListFilters(DCB *);
/** /**

4
server/core/config.c
View File

@ -3183,7 +3183,7 @@ int create_new_filter(CONFIG_CONTEXT *obj)
char *s = strtok_r(options, ",", &lasts); char *s = strtok_r(options, ",", &lasts);
while (s) while (s)
{ {
filterAddOption(obj->element, s); filter_add_option(obj->element, s);
s = strtok_r(NULL, ",", &lasts); s = strtok_r(NULL, ",", &lasts);
} }
} }
@ -3193,7 +3193,7 @@ int create_new_filter(CONFIG_CONTEXT *obj)
{ {
if (strcmp(params->name, "module") && strcmp(params->name, "options")) if (strcmp(params->name, "module") && strcmp(params->name, "options"))
{ {
filterAddParameter(obj->element, params->name, params->value); filter_add_parameter(obj->element, params->name, params->value);
} }
params = params->next; params = params->next;
} }

40
server/core/filter.c
View File

@ -48,22 +48,22 @@ static void filter_free_parameters(FILTER_DEF *filter);
* @return The newly created filter or NULL if an error occured * @return The newly created filter or NULL if an error occured
*/ */
FILTER_DEF * FILTER_DEF *
filter_alloc(char *name, char *module) filter_alloc(const char *name, const char *module)
{ {
name = MXS_STRDUP(name); char* my_name = MXS_STRDUP(name);
module = MXS_STRDUP(module); char* my_module = MXS_STRDUP(module);
FILTER_DEF *filter = (FILTER_DEF *)MXS_MALLOC(sizeof(FILTER_DEF)); FILTER_DEF *filter = (FILTER_DEF *)MXS_MALLOC(sizeof(FILTER_DEF));
if (!name || !module || !filter) if (!my_name || !my_module || !filter)
{ {
MXS_FREE(name); MXS_FREE(my_name);
MXS_FREE(module); MXS_FREE(my_module);
MXS_FREE(filter); MXS_FREE(filter);
return NULL; return NULL;
} }
filter->name = name; filter->name = my_name;
filter->module = module; filter->module = my_module;
filter->filter = NULL; filter->filter = NULL;
filter->options = NULL; filter->options = NULL;
filter->obj = NULL; filter->obj = NULL;
@ -140,7 +140,7 @@ filter_free(FILTER_DEF *filter)
* @return The server or NULL if not found * @return The server or NULL if not found
*/ */
FILTER_DEF * FILTER_DEF *
filter_find(char *name) filter_find(const char *name)
{ {
FILTER_DEF *filter; FILTER_DEF *filter;
@ -164,7 +164,7 @@ filter_find(char *name)
* @param name Parameter name to check * @param name Parameter name to check
*/ */
int int
filter_standard_parameter(char *name) filter_standard_parameter(const char *name)
{ {
if (strcmp(name, "type") == 0 || strcmp(name, "module") == 0) if (strcmp(name, "type") == 0 || strcmp(name, "module") == 0)
{ {
@ -220,7 +220,7 @@ dprintAllFilters(DCB *dcb)
* to display all active filters in MaxScale * to display all active filters in MaxScale
*/ */
void void
dprintFilter(DCB *dcb, FILTER_DEF *filter) dprintFilter(DCB *dcb, const FILTER_DEF *filter)
{ {
int i; int i;
@ -287,7 +287,7 @@ dListFilters(DCB *dcb)
* @param option The option string * @param option The option string
*/ */
void void
filterAddOption(FILTER_DEF *filter, char *option) filter_add_option(FILTER_DEF *filter, const char *option)
{ {
int i; int i;
@ -323,7 +323,7 @@ filterAddOption(FILTER_DEF *filter, char *option)
* @param value The parameter value * @param value The parameter value
*/ */
void void
filterAddParameter(FILTER_DEF *filter, char *name, char *value) filter_add_parameter(FILTER_DEF *filter, const char *name, const char *value)
{ {
int i; int i;
@ -344,13 +344,13 @@ filterAddParameter(FILTER_DEF *filter, char *name, char *value)
(i + 2) * sizeof(FILTER_PARAMETER *)); (i + 2) * sizeof(FILTER_PARAMETER *));
} }
FILTER_PARAMETER *parameter = MXS_CALLOC(1, sizeof(FILTER_PARAMETER)); FILTER_PARAMETER *parameter = MXS_CALLOC(1, sizeof(FILTER_PARAMETER));
name = MXS_STRDUP(name); char* my_name = MXS_STRDUP(name);
value = MXS_STRDUP(value); char* my_value = MXS_STRDUP(value);
MXS_ABORT_IF_TRUE(!parameters || !parameter || !name || !value); MXS_ABORT_IF_TRUE(!parameters || !parameter || !my_name || !my_value);
parameter->name = name; parameter->name = my_name;
parameter->value = value; parameter->value = my_value;
parameters[i] = parameter; parameters[i] = parameter;
parameters[i + 1] = NULL; parameters[i + 1] = NULL;
filter->parameters = parameters; filter->parameters = parameters;
@ -433,7 +433,7 @@ bool filter_load(FILTER_DEF* filter)
* if the filter could not be created * if the filter could not be created
*/ */
DOWNSTREAM * DOWNSTREAM *
filterApply(FILTER_DEF *filter, SESSION *session, DOWNSTREAM *downstream) filter_apply(FILTER_DEF *filter, SESSION *session, DOWNSTREAM *downstream)
{ {
DOWNSTREAM *me; DOWNSTREAM *me;
@ -468,7 +468,7 @@ filterApply(FILTER_DEF *filter, SESSION *session, DOWNSTREAM *downstream)
* @return The upstream component for the next filter * @return The upstream component for the next filter
*/ */
UPSTREAM * UPSTREAM *
filterUpstream(FILTER_DEF *filter, void *fsession, UPSTREAM *upstream) filter_upstream(FILTER_DEF *filter, void *fsession, UPSTREAM *upstream)
{ {
UPSTREAM *me = NULL; UPSTREAM *me = NULL;

12
server/core/session.c
View File

@ -661,8 +661,8 @@ session_setup_filters(SESSION *session)
MXS_ERROR("Service '%s' contians an unresolved filter.", service->name); MXS_ERROR("Service '%s' contians an unresolved filter.", service->name);
return 0; return 0;
} }
if ((head = filterApply(service->filters[i], session, if ((head = filter_apply(service->filters[i], session,
&session->head)) == NULL) &session->head)) == NULL)
{ {
MXS_ERROR("Failed to create filter '%s' for " MXS_ERROR("Failed to create filter '%s' for "
"service '%s'.\n", "service '%s'.\n",
@ -679,9 +679,9 @@ session_setup_filters(SESSION *session)
for (i = 0; i < service->n_filters; i++) for (i = 0; i < service->n_filters; i++)
{ {
if ((tail = filterUpstream(service->filters[i], if ((tail = filter_upstream(service->filters[i],
session->filters[i].session, session->filters[i].session,
&session->tail)) == NULL) &session->tail)) == NULL)
{ {
MXS_ERROR("Failed to create filter '%s' for service '%s'.", MXS_ERROR("Failed to create filter '%s' for service '%s'.",
service->filters[i]->name, service->filters[i]->name,
@ -690,7 +690,7 @@ session_setup_filters(SESSION *session)
} }
/* /*
* filterUpstream may simply return the 3 parameter if * filter_upstream may simply return the 3 parameter if
* the filter has no upstream entry point. So no need * the filter has no upstream entry point. So no need
* to copy the contents or free tail in this case. * to copy the contents or free tail in this case.
*/ */

12
server/core/test/testfilter.c
View File

@ -83,12 +83,12 @@ test2()
fprintf(stderr, "filter_alloc: test 1 failed.\n"); fprintf(stderr, "filter_alloc: test 1 failed.\n");
return 1; return 1;
} }
filterAddOption(f1, "option1"); filter_add_option(f1, "option1");
filterAddOption(f1, "option2"); filter_add_option(f1, "option2");
filterAddOption(f1, "option3"); filter_add_option(f1, "option3");
filterAddParameter(f1, "name1", "value1"); filter_add_parameter(f1, "name1", "value1");
filterAddParameter(f1, "name2", "value2"); filter_add_parameter(f1, "name2", "value2");
filterAddParameter(f1, "name3", "value3"); filter_add_parameter(f1, "name3", "value3");
return 0; return 0;
} }

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

@ -596,8 +596,7 @@ newSession(FILTER *instance, SESSION *session)
my_session->branch_dcb = dcb; my_session->branch_dcb = dcb;
my_session->dummy_filterdef = dummy; my_session->dummy_filterdef = dummy;
if ((dummy_upstream = filterUpstream( if ((dummy_upstream = filter_upstream(dummy, my_session, &ses->tail)) == NULL)
dummy, my_session, &ses->tail)) == NULL)
{ {
filter_free(dummy); filter_free(dummy);
closeSession(instance, (void*) my_session); closeSession(instance, (void*) my_session);