From a6df8754952cec61b55be50a6fd5c2987d0d5dde Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Wed, 30 Nov 2016 15:19:14 +0200 Subject: [PATCH] Make filter const correct and use snake case CamelCase is still in use with the printing functions. --- include/maxscale/filter.h | 16 ++++++------- server/core/config.c | 4 ++-- server/core/filter.c | 40 ++++++++++++++++----------------- server/core/session.c | 12 +++++----- server/core/test/testfilter.c | 12 +++++----- server/modules/filter/tee/tee.c | 3 +-- 6 files changed, 43 insertions(+), 44 deletions(-) diff --git a/include/maxscale/filter.h b/include/maxscale/filter.h index 27a1ef8f6..3b25b4483 100644 --- a/include/maxscale/filter.h +++ b/include/maxscale/filter.h @@ -109,17 +109,17 @@ typedef struct filter_def struct filter_def *next; /**< Next filter in the chain of all filters */ } FILTER_DEF; -FILTER_DEF *filter_alloc(char *, char *); +FILTER_DEF *filter_alloc(const char *, const char *); void filter_free(FILTER_DEF *); bool filter_load(FILTER_DEF* filter); -FILTER_DEF *filter_find(char *); -void filterAddOption(FILTER_DEF *, char *); -void filterAddParameter(FILTER_DEF *, char *, char *); -DOWNSTREAM *filterApply(FILTER_DEF *, SESSION *, DOWNSTREAM *); -UPSTREAM *filterUpstream(FILTER_DEF *, void *, UPSTREAM *); -int filter_standard_parameter(char *); +FILTER_DEF *filter_find(const char *); +void filter_add_option(FILTER_DEF *, const char *); +void filter_add_parameter(FILTER_DEF *, const char *, const char *); +DOWNSTREAM *filter_apply(FILTER_DEF *, SESSION *, DOWNSTREAM *); +UPSTREAM *filter_upstream(FILTER_DEF *, void *, UPSTREAM *); +int filter_standard_parameter(const char *); void dprintAllFilters(DCB *); -void dprintFilter(DCB *, FILTER_DEF *); +void dprintFilter(DCB *, const FILTER_DEF *); void dListFilters(DCB *); /** diff --git a/server/core/config.c b/server/core/config.c index 70ae9c77e..2e9009889 100644 --- a/server/core/config.c +++ b/server/core/config.c @@ -3183,7 +3183,7 @@ int create_new_filter(CONFIG_CONTEXT *obj) char *s = strtok_r(options, ",", &lasts); while (s) { - filterAddOption(obj->element, s); + filter_add_option(obj->element, s); 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")) { - filterAddParameter(obj->element, params->name, params->value); + filter_add_parameter(obj->element, params->name, params->value); } params = params->next; } diff --git a/server/core/filter.c b/server/core/filter.c index c3f8812b1..9536d4c2c 100644 --- a/server/core/filter.c +++ b/server/core/filter.c @@ -48,22 +48,22 @@ static void filter_free_parameters(FILTER_DEF *filter); * @return The newly created filter or NULL if an error occured */ FILTER_DEF * -filter_alloc(char *name, char *module) +filter_alloc(const char *name, const char *module) { - name = MXS_STRDUP(name); - module = MXS_STRDUP(module); + char* my_name = MXS_STRDUP(name); + char* my_module = MXS_STRDUP(module); 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(module); + MXS_FREE(my_name); + MXS_FREE(my_module); MXS_FREE(filter); return NULL; } - filter->name = name; - filter->module = module; + filter->name = my_name; + filter->module = my_module; filter->filter = NULL; filter->options = NULL; filter->obj = NULL; @@ -140,7 +140,7 @@ filter_free(FILTER_DEF *filter) * @return The server or NULL if not found */ FILTER_DEF * -filter_find(char *name) +filter_find(const char *name) { FILTER_DEF *filter; @@ -164,7 +164,7 @@ filter_find(char *name) * @param name Parameter name to check */ int -filter_standard_parameter(char *name) +filter_standard_parameter(const char *name) { if (strcmp(name, "type") == 0 || strcmp(name, "module") == 0) { @@ -220,7 +220,7 @@ dprintAllFilters(DCB *dcb) * to display all active filters in MaxScale */ void -dprintFilter(DCB *dcb, FILTER_DEF *filter) +dprintFilter(DCB *dcb, const FILTER_DEF *filter) { int i; @@ -287,7 +287,7 @@ dListFilters(DCB *dcb) * @param option The option string */ void -filterAddOption(FILTER_DEF *filter, char *option) +filter_add_option(FILTER_DEF *filter, const char *option) { int i; @@ -323,7 +323,7 @@ filterAddOption(FILTER_DEF *filter, char *option) * @param value The parameter value */ void -filterAddParameter(FILTER_DEF *filter, char *name, char *value) +filter_add_parameter(FILTER_DEF *filter, const char *name, const char *value) { int i; @@ -344,13 +344,13 @@ filterAddParameter(FILTER_DEF *filter, char *name, char *value) (i + 2) * sizeof(FILTER_PARAMETER *)); } FILTER_PARAMETER *parameter = MXS_CALLOC(1, sizeof(FILTER_PARAMETER)); - name = MXS_STRDUP(name); - value = MXS_STRDUP(value); + char* my_name = MXS_STRDUP(name); + 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->value = value; + parameter->name = my_name; + parameter->value = my_value; parameters[i] = parameter; parameters[i + 1] = NULL; filter->parameters = parameters; @@ -433,7 +433,7 @@ bool filter_load(FILTER_DEF* filter) * if the filter could not be created */ DOWNSTREAM * -filterApply(FILTER_DEF *filter, SESSION *session, DOWNSTREAM *downstream) +filter_apply(FILTER_DEF *filter, SESSION *session, DOWNSTREAM *downstream) { DOWNSTREAM *me; @@ -468,7 +468,7 @@ filterApply(FILTER_DEF *filter, SESSION *session, DOWNSTREAM *downstream) * @return The upstream component for the next filter */ UPSTREAM * -filterUpstream(FILTER_DEF *filter, void *fsession, UPSTREAM *upstream) +filter_upstream(FILTER_DEF *filter, void *fsession, UPSTREAM *upstream) { UPSTREAM *me = NULL; diff --git a/server/core/session.c b/server/core/session.c index 7648fe45e..9b155c982 100644 --- a/server/core/session.c +++ b/server/core/session.c @@ -661,8 +661,8 @@ session_setup_filters(SESSION *session) MXS_ERROR("Service '%s' contians an unresolved filter.", service->name); return 0; } - if ((head = filterApply(service->filters[i], session, - &session->head)) == NULL) + if ((head = filter_apply(service->filters[i], session, + &session->head)) == NULL) { MXS_ERROR("Failed to create filter '%s' for " "service '%s'.\n", @@ -679,9 +679,9 @@ session_setup_filters(SESSION *session) for (i = 0; i < service->n_filters; i++) { - if ((tail = filterUpstream(service->filters[i], - session->filters[i].session, - &session->tail)) == NULL) + if ((tail = filter_upstream(service->filters[i], + session->filters[i].session, + &session->tail)) == NULL) { MXS_ERROR("Failed to create filter '%s' for service '%s'.", 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 * to copy the contents or free tail in this case. */ diff --git a/server/core/test/testfilter.c b/server/core/test/testfilter.c index 377f5a7af..2fb88b68a 100644 --- a/server/core/test/testfilter.c +++ b/server/core/test/testfilter.c @@ -83,12 +83,12 @@ test2() fprintf(stderr, "filter_alloc: test 1 failed.\n"); return 1; } - filterAddOption(f1, "option1"); - filterAddOption(f1, "option2"); - filterAddOption(f1, "option3"); - filterAddParameter(f1, "name1", "value1"); - filterAddParameter(f1, "name2", "value2"); - filterAddParameter(f1, "name3", "value3"); + filter_add_option(f1, "option1"); + filter_add_option(f1, "option2"); + filter_add_option(f1, "option3"); + filter_add_parameter(f1, "name1", "value1"); + filter_add_parameter(f1, "name2", "value2"); + filter_add_parameter(f1, "name3", "value3"); return 0; } diff --git a/server/modules/filter/tee/tee.c b/server/modules/filter/tee/tee.c index ab91bfd3a..26a15e130 100644 --- a/server/modules/filter/tee/tee.c +++ b/server/modules/filter/tee/tee.c @@ -596,8 +596,7 @@ newSession(FILTER *instance, SESSION *session) my_session->branch_dcb = dcb; my_session->dummy_filterdef = dummy; - if ((dummy_upstream = filterUpstream( - dummy, my_session, &ses->tail)) == NULL) + if ((dummy_upstream = filter_upstream(dummy, my_session, &ses->tail)) == NULL) { filter_free(dummy); closeSession(instance, (void*) my_session);