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

MXS-1220: Make filter to JSON functions const correct

Browse Source 
The functions don't modify the filters when the JSON is generated. This
means that the parameters can be const.

Minor formatting fixes to service sources.
This commit is contained in:
Markus Mäkelä 2017-04-17 19:17:11 +03:00 committed by Markus Mäkelä
parent b656f2b300
commit d2e4d9cc64
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/filter.h
View File

@ -253,7 +253,7 @@ MXS_FILTER* filter_def_get_instance(const MXS_FILTER_DEF* filter_def);
*
* @return Filter converted to JSON format
*/
json_t* filter_to_json(MXS_FILTER_DEF* filter);
json_t* filter_to_json(const MXS_FILTER_DEF* filter);
/**
* @brief Convert all filters into JSON

2
server/core/filter.cc
View File

@ -467,7 +467,7 @@ filter_upstream(MXS_FILTER_DEF *filter, MXS_FILTER_SESSION *fsession, MXS_UPSTRE
return me;
}
json_t* filter_to_json(MXS_FILTER_DEF* filter)
json_t* filter_to_json(const MXS_FILTER_DEF* filter)
{
json_t* rval = json_object();
json_object_set_new(rval, "name", json_string(filter->name));

22
server/core/service.cc
View File

@ -2352,21 +2352,21 @@ static const char* service_state_to_string(int state)
{
switch (state)
{
case SERVICE_STATE_STARTED:
return "Started";
case SERVICE_STATE_STARTED:
return "Started";
case SERVICE_STATE_STOPPED:
return "Stopped";
case SERVICE_STATE_STOPPED:
return "Stopped";
case SERVICE_STATE_FAILED:
return "Failed";
case SERVICE_STATE_FAILED:
return "Failed";
case SERVICE_STATE_ALLOC:
return "Allocated";
case SERVICE_STATE_ALLOC:
return "Allocated";
default:
ss_dassert(false);
return "Unknown";
default:
ss_dassert(false);
return "Unknown";
}
}