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:
Valentine Krasnobaeva 2024-08-05 10:04:03 +02:00 committed by Willy Tarreau
parent 5b52df4c4d
commit c6cfa7cb4a
5 changed files with 5 additions and 5 deletions

View File

@ -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);
FLT_OT_RETURN_INT(retval);
}
retval = readcfgfile(&cfg_file);
retval = parse_cfg(&cfg_file);
ha_free(&cfg_file.content);
}

View File

@ -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_track_sc_num(unsigned int *track_sc_num,
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_unregister_keywords(struct cfg_kw_list *kwl);
int check_config_validity(void);

View File

@ -1826,7 +1826,7 @@ free_mem:
* Only the two first ones can stop processing, the two others are just
* indicators.
*/
int readcfgfile(const struct cfgfile *cfg)
int parse_cfg(const struct cfgfile *cfg)
{
char *thisline = NULL;
int linesize = LINESIZE;

View File

@ -2272,7 +2272,7 @@ static int parse_spoe_flt(char **args, int *cur_arg, struct proxy *px,
if (cfg_file.size < 0) {
goto error;
}
ret = readcfgfile(&cfg_file);
ret = parse_cfg(&cfg_file);
ha_free(&cfg_file.content);
/* unregister SPOE sections and restore previous sections */

View File

@ -1206,7 +1206,7 @@ static int read_cfg(char *progname)
goto err;
}
ret = readcfgfile(cfg);
ret = parse_cfg(cfg);
if (ret == -1)
goto err;