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

Remove unused functions from config.h

Browse Source 
The header is divided into two parts, an external and an internal one. The
actual splitting is done in a later commit and this commit only prepares
the header for the split.
This commit is contained in:
Markus Mäkelä
2017-01-16 10:19:16 +02:00
parent 08b5d5c957
commit cbdab48237
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/maxscale/config.h
View File

@ -49,16 +49,7 @@ enum
MAX_PARAM_LEN = 256
};
typedef enum
{
UNDEFINED_TYPE = 0x00,
STRING_TYPE = 0x01,
COUNT_TYPE = 0x02,
PERCENT_TYPE = 0x04,
BOOL_TYPE = 0x08,
SQLVAR_TARGET_TYPE = 0x10
} config_param_type_t;
/** TODO: Remove this from the core and move it inside readwritesplit */
typedef enum
{
TYPE_UNDEFINED = 0,
@ -322,6 +313,26 @@ struct server* config_get_server(const CONFIG_PARAMETER *params, const char *key
*/
char* config_copy_string(const CONFIG_PARAMETER *params, const char *key);
/**
* @brief Convert string truth value
*
* Used for truth values with @c 1, @c yes or @c true for a boolean true value and @c 0, @c no
* or @c false for a boolean false value.
*
* @param str String to convert to a truth value
*
* @return 1 if @c value is true, 0 if value is false and -1 if the value is not
* a valid truth value
*/
int config_truth_value(const char *value);
/** TODO: Add new capability that allows skipping of permission checks */
bool is_internal_service(const char *router);
/***************************************************************************************
* TODO: Move the following functions to a header that's internal to the MaxScale core *
***************************************************************************************/
/**
* @brief Generate default module parameters
*
@ -329,8 +340,6 @@ char* config_copy_string(const CONFIG_PARAMETER *params, const char *key);
*
* @param ctx Configuration context where the parameters are added
* @param params Module parameters
*
* TODO: Move this to a header internal to the MaxScale core
*/
void config_add_defaults(CONFIG_CONTEXT *ctx, const MXS_MODULE_PARAM *params);
@ -338,15 +347,12 @@ char* config_clean_string_list(const char* str);
CONFIG_PARAMETER* config_clone_param(const CONFIG_PARAMETER* param);
void config_enable_feedback_task(void);
void config_disable_feedback_task(void);
unsigned long config_get_gateway_id(void);
GATEWAY_CONF* config_get_global_options();
bool config_load(const char *);
unsigned int config_nbpolls();
unsigned int config_pollsleep();
bool config_reload();
int config_threadcount();
int config_truth_value(const char *);
void config_parameter_free(CONFIG_PARAMETER* p1);
bool is_internal_service(const char *router);
MXS_END_DECLS