mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: logs: use __fallthrough in build_log_header()

Browse Source 
This avoids 4 build warnings when preprocessing happens before compiling
with gcc >= 7.
This commit is contained in:
Willy Tarreau 2022-11-14 07:22:57 +01:00
parent 3064f52b15
commit 80f9a63184
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/log.c
View File

@ -627,7 +627,7 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
cformat = LF_SEPARATOR; cformat = LF_SEPARATOR;
break; break;
} }
/* fall through */ __fallthrough;
default : cformat = LF_TEXT; break; default : cformat = LF_TEXT; break;
} }
} }
@ -1383,7 +1383,7 @@ struct ist *build_log_header(enum log_fmt format, int level, int facility,
case LOG_FORMAT_PRIO: case LOG_FORMAT_PRIO:
fac_level = facility << 3; fac_level = facility << 3;
/* further format ignore the facility */ /* further format ignore the facility */
/* fall through */ __fallthrough;
case LOG_FORMAT_TIMED: case LOG_FORMAT_TIMED:
case LOG_FORMAT_SHORT: case LOG_FORMAT_SHORT:
fac_level += level; fac_level += level;
@ -1476,7 +1476,7 @@ struct ist *build_log_header(enum log_fmt format, int level, int facility,
break; break;
} }
/* let continue as 'timed' and 'iso' format for usual timestamp */ /* let continue as 'timed' and 'iso' format for usual timestamp */
/* fall through */ __fallthrough;
case LOG_FORMAT_TIMED: case LOG_FORMAT_TIMED:
case LOG_FORMAT_ISO: case LOG_FORMAT_ISO:
/* ISO format ex: '1900:01:01T12:00:00.123456Z' /* ISO format ex: '1900:01:01T12:00:00.123456Z'
@ -1550,7 +1550,7 @@ struct ist *build_log_header(enum log_fmt format, int level, int facility,
} }
else /* the caller MUST fill the hostname, this field is mandatory */ else /* the caller MUST fill the hostname, this field is mandatory */
hdr_ctx.ist_vector[(*nbelem)++] = ist2("localhost ", 10); hdr_ctx.ist_vector[(*nbelem)++] = ist2("localhost ", 10);
/* fall through */ __fallthrough;
case LOG_FORMAT_LOCAL: case LOG_FORMAT_LOCAL:
if (!metadata || !metadata[LOG_META_TAG].len) if (!metadata || !metadata[LOG_META_TAG].len)
break; break;