mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-06 15:17:01 +02:00
MINOR: startup: rename readcfgfile in parse_cfg
As readcfgfile no longer opens configuration files and reads them with fgets, but performs only the parsing of provided data, let's rename it to parse_cfg by analogy with read_cfg in haproxy.c.
This commit is contained in:
parent
5b52df4c4d
commit
c6cfa7cb4a
@ -1102,7 +1102,7 @@ static int flt_ot_parse_cfg(struct flt_ot_conf *conf, const char *flt_name, char
|
|||||||
ha_free(&cfg_file.content);
|
ha_free(&cfg_file.content);
|
||||||
FLT_OT_RETURN_INT(retval);
|
FLT_OT_RETURN_INT(retval);
|
||||||
}
|
}
|
||||||
retval = readcfgfile(&cfg_file);
|
retval = parse_cfg(&cfg_file);
|
||||||
ha_free(&cfg_file.content);
|
ha_free(&cfg_file.content);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,7 +112,7 @@ int cfg_parse_global(const char *file, int linenum, char **args, int inv);
|
|||||||
int cfg_parse_listen(const char *file, int linenum, char **args, int inv);
|
int cfg_parse_listen(const char *file, int linenum, char **args, int inv);
|
||||||
int cfg_parse_track_sc_num(unsigned int *track_sc_num,
|
int cfg_parse_track_sc_num(unsigned int *track_sc_num,
|
||||||
const char *arg, const char *end, char **err);
|
const char *arg, const char *end, char **err);
|
||||||
int readcfgfile(const struct cfgfile *cfg);
|
int parse_cfg(const struct cfgfile *cfg);
|
||||||
void cfg_register_keywords(struct cfg_kw_list *kwl);
|
void cfg_register_keywords(struct cfg_kw_list *kwl);
|
||||||
void cfg_unregister_keywords(struct cfg_kw_list *kwl);
|
void cfg_unregister_keywords(struct cfg_kw_list *kwl);
|
||||||
int check_config_validity(void);
|
int check_config_validity(void);
|
||||||
|
@ -1826,7 +1826,7 @@ ssize_t load_cfg_in_mem(char *filename, char **cfg_content)
|
|||||||
* Only the two first ones can stop processing, the two others are just
|
* Only the two first ones can stop processing, the two others are just
|
||||||
* indicators.
|
* indicators.
|
||||||
*/
|
*/
|
||||||
int readcfgfile(const struct cfgfile *cfg)
|
int parse_cfg(const struct cfgfile *cfg)
|
||||||
{
|
{
|
||||||
char *thisline = NULL;
|
char *thisline = NULL;
|
||||||
int linesize = LINESIZE;
|
int linesize = LINESIZE;
|
||||||
|
@ -2272,7 +2272,7 @@ static int parse_spoe_flt(char **args, int *cur_arg, struct proxy *px,
|
|||||||
if (cfg_file.size < 0) {
|
if (cfg_file.size < 0) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
ret = readcfgfile(&cfg_file);
|
ret = parse_cfg(&cfg_file);
|
||||||
ha_free(&cfg_file.content);
|
ha_free(&cfg_file.content);
|
||||||
|
|
||||||
/* unregister SPOE sections and restore previous sections */
|
/* unregister SPOE sections and restore previous sections */
|
||||||
|
@ -1206,7 +1206,7 @@ static int read_cfg(char *progname)
|
|||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = readcfgfile(cfg);
|
ret = parse_cfg(cfg);
|
||||||
if (ret == -1)
|
if (ret == -1)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user