RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: tcp: avoid confusion in time parsing init 

We never enter val_fc_time_value when an associated fetcher such as `fc_rtt` is
called without argument.  meaning `type == ARGT_STOP` will never be true and so
the default `data.sint = TIME_UNIT_MS` will never be set.  remove this part to
avoid thinking default data.sint is set to ms while reading the code.

Signed-off-by: William Dauchy <w.dauchy@criteo.com>

[Cf: This patch may safely backported as far as 1.7. But no matter if not.]
This commit is contained in:
William Dauchy 2019-10-23 19:31:36 +02:00 committed by Christopher Faulet
parent 705e088f0a
commit b705b4d7d3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/proto_tcp.c
View File

@ -1580,10 +1580,6 @@ smp_fetch_dport(const struct arg *args, struct sample *smp, const char *kw, void
*/ */
static int val_fc_time_value(struct arg *args, char **err) static int val_fc_time_value(struct arg *args, char **err)
{ {
if (args[0].type == ARGT_STOP) {
args[0].type = ARGT_SINT;
args[0].data.sint = TIME_UNIT_MS;
}
if (args[0].type == ARGT_STR) { if (args[0].type == ARGT_STR) {
if (strcmp(args[0].data.str.area, "us") == 0) { if (strcmp(args[0].data.str.area, "us") == 0) {
free(args[0].data.str.area); free(args[0].data.str.area);