mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 14:21:00 +01:00
Code Issues Projects Releases Wiki Activity

REORG: tools: move list_append_word to cfgparse

Browse Source 
Let's move list_append_word to cfgparse.c as it is used only to fill
cfg_cfgfiles list with configuration file names.
This commit is contained in:
Valentine Krasnobaeva 2024-08-07 18:12:48 +02:00 committed by Willy Tarreau
parent 70b842e847
commit 39f2a19620
4 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/cfgparse.h
View File

@ -140,6 +140,7 @@ const char *cfg_find_best_match(const char *word, const struct list *list, int s
int warnifnotcap(struct proxy *proxy, int cap, const char *file, int line, const char *arg, const char *hint);
int failifnotcap(struct proxy *proxy, int cap, const char *file, int line, const char *arg, const char *hint);
void cfg_dump_registered_keywords();
int list_append_word(struct list *li, const char *str, char **err);
/* simplified way to define a section parser */
#define REGISTER_CONFIG_SECTION(name, parse, post) \

2
include/haproxy/tools.h
View File

@ -1034,8 +1034,6 @@ static inline unsigned long long rdtsc()
* The caller is responsible for freeing the <err> and <str> copy
* memory area using free()
*/
struct list;
int list_append_word(struct list *li, const char *str, char **err);
int dump_text(struct buffer *out, const char *buf, int bsize);
int dump_binary(struct buffer *out, const char *buf, int bsize);

32
src/cfgparse.c
View File

@ -1717,6 +1717,38 @@ static int cfg_parse_global_def_path(char **args, int section_type, struct proxy
return ret;
}
/* append a copy of string <str> (in a wordlist) at the end of the list <li>
* On failure : return 0 and <err> filled with an error message.
* The caller is responsible for freeing the <err> and <str> copy
* memory area using free()
*/
int list_append_word(struct list *li, const char *str, char **err)
{
struct wordlist *wl;
wl = calloc(1, sizeof(*wl));
if (!wl) {
memprintf(err, "out of memory");
goto fail_wl;
}
wl->s = strdup(str);
if (!wl->s) {
memprintf(err, "out of memory");
goto fail_wl_s;
}
LIST_APPEND(li, &wl->list);
return 1;
fail_wl_s:
free(wl->s);
fail_wl:
free(wl);
return 0;
}
/*
* This function reads and parses the configuration file given in the argument.
* Returns the error code, 0 if OK, -1 if the config file couldn't be opened,

32
src/tools.c
View File

@ -4883,38 +4883,6 @@ unsigned char utf8_next(const char *s, int len, unsigned int *c)
return code | ((p-(unsigned char *)s)&0x0f);
}
/* append a copy of string <str> (in a wordlist) at the end of the list <li>
* On failure : return 0 and <err> filled with an error message.
* The caller is responsible for freeing the <err> and <str> copy
* memory area using free()
*/
int list_append_word(struct list *li, const char *str, char **err)
{
struct wordlist *wl;
wl = calloc(1, sizeof(*wl));
if (!wl) {
memprintf(err, "out of memory");
goto fail_wl;
}
wl->s = strdup(str);
if (!wl->s) {
memprintf(err, "out of memory");
goto fail_wl_s;
}
LIST_APPEND(li, &wl->list);
return 1;
fail_wl_s:
free(wl->s);
fail_wl:
free(wl);
return 0;
}
/* indicates if a memory location may safely be read or not. The trick consists
* in performing a harmless syscall using this location as an input and letting
* the operating system report whether it's OK or not. For this we have the