upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-06-10 09:21:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

BUG/MINOR: log: add_to_logformat_list() used the wrong constants

Browse source 
The <type> argument was checked against LOG_FMT_* but it was passed as
LF_* which are two independant enums. It happens that the 3 first entries
in these enums do match, but this broke some experimental changes which
required another state, so let's fix this now.
This commit is contained in:
Willy Tarreau 2012-12-20 21:59:12 +01:00
parent 2beef58888
commit a357166889
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/log.c
View file

@ -302,7 +302,7 @@ void add_to_logformat_list(char *start, char *end, int type, struct list *list_f
{
char *str;
if (type == LOG_FMT_TEXT) { /* type text */
if (type == LF_TEXT) { /* type text */
struct logformat_node *node = calloc(1, sizeof(struct logformat_node));
str = calloc(end - start + 1, 1);
strncpy(str, start, end - start);
@ -310,7 +310,7 @@ void add_to_logformat_list(char *start, char *end, int type, struct list *list_f
node->arg = str;
node->type = LOG_FMT_TEXT; // type string
LIST_ADDQ(list_format, &node->list);
} else if (type == LOG_FMT_SEPARATOR) {
} else if (type == LF_SEPARATOR) {
struct logformat_node *node = calloc(1, sizeof(struct logformat_node));
node->type = LOG_FMT_SEPARATOR;
LIST_ADDQ(list_format, &node->list);