upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-22 23:02:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

BUILD: vars: avoid overlapping field initialization

Browse source 
Compiling vars.c with gcc 4.2 shows that we're initializing some local
structs field members in a not really portable way:

src/vars.c: In function 'vars_parse_cli_set_var':
src/vars.c:1195: warning: initialized field overwritten
src/vars.c:1195: warning: (near initialization for 'px.conf.args')
src/vars.c:1195: warning: initialized field overwritten
src/vars.c:1195: warning: (near initialization for 'px.conf')
src/vars.c:1201: warning: initialized field overwritten
src/vars.c:1201: warning: (near initialization for 'rule.conf')

It's totally harmless anyway, but better clean this up.
This commit is contained in:
Willy Tarreau 2022-01-28 09:22:07 +01:00
parent 95d3eaff36
commit e90dde1edf
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vars.c
View file

@ -1071,14 +1071,12 @@ static int vars_parse_global_set_var(char **args, int section_type, struct proxy
{
struct proxy px = {
.id = "CFG",
.conf.args.file = file,
.conf.args.line = line,
.conf.args = { .file = file, .line = line, },
};
struct act_rule rule = {
.arg.vars.scope = SCOPE_PROC,
.from = ACT_F_CFG_PARSER,
.conf.file = (char *)file,
.conf.line = line,
.conf = { .file = (char *)file, .line = line, },
};
enum obj_type objt = OBJ_TYPE_NONE;
struct session *sess = NULL;
@ -1192,14 +1190,12 @@ static int vars_parse_cli_set_var(char **args, char *payload, struct appctx *app
{
struct proxy px = {
.id = "CLI",
.conf.args.file = "CLI",
.conf.args.line = 0,
.conf.args = { .file = "CLI", .line = 0, },
};
struct act_rule rule = {
.arg.vars.scope = SCOPE_PROC,
.from = ACT_F_CLI_PARSER,
.conf.file = "CLI",
.conf.line = 0,
.conf = { .file = "CLI", .line = 0, },
};
enum obj_type objt = OBJ_TYPE_NONE;
struct session *sess = NULL;