legacy-gateway-latency4: Code cleanup

No functional changes.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/daemon/sources/legacy-gateway-latency4.c b/src/daemon/sources/legacy-gateway-latency4.c
index 62183a664f7afc2deeb7f1fcf2c381a0240b1664..5226becdf099d4ebed709a1dd64004c807f8bc8d 100644 (file)
--- a/src/daemon/sources/legacy-gateway-latency4.c
+++ b/src/daemon/sources/legacy-gateway-latency4.c
@@ -134,20 +134,20 @@ ERROR:
 static int legacy_gateway_latency_on_success(td_ctx* ctx,
                int rc, td_file* stdout, void* data) {
        td_source* source = data;
+       double stddev = -1.0;
        double min = -1.0;
        double avg = -1.0;
        double max = -1.0;
-       double mdev = -1.0;
        double loss = 0;
        int r;
 
        td_file_parser parser[] = {
                // ping
-               PARSE4("rtt min/avg/max/mdev = %lf/%lf/%lf/%lf ms", &min, &avg, &max, &mdev),
+               PARSE4("rtt min/avg/max/mdev = %lf/%lf/%lf/%lf ms", &min, &avg, &max, &stddev),
                PARSE1("%*d packets transmitted, %*d received, %lf%% packet loss", &loss),
 
                // arping
-               PARSE4("rtt min/avg/max/std-dev = %lf/%lf/%lf/%lf ms", &min, &avg, &max, &mdev),
+               PARSE4("rtt min/avg/max/std-dev = %lf/%lf/%lf/%lf ms", &min, &avg, &max, &stddev),
                PARSE1("%*d packets transmitted, %*d packets received, %lf%% unanswered", &loss),
                { NULL },
        };
@@ -158,13 +158,13 @@ static int legacy_gateway_latency_on_success(td_ctx* ctx,
                return r;
 
        // Convert the latency and standard deviation to seconds
-       avg  = MSEC_TO_SEC(avg);
-       mdev = MSEC_TO_SEC(mdev);
+       avg    = MSEC_TO_SEC(avg);
+       stddev = MSEC_TO_SEC(stddev);
 
        // Submit values
        return td_source_submit_values(source, NULL, VALUES(
                VALUE_FLOAT("latency", &avg),
-               VALUE_FLOAT("stddev",  &mdev),
+               VALUE_FLOAT("stddev",  &stddev),
                VALUE_FLOAT("loss",    &loss)
        ));
 }
@@ -179,7 +179,10 @@ static int do_arping(td_ctx* ctx, td_source* source, const char* address) {
                // Wait up to 100ms between packets
                "-W 0.1",
 
-               address, NULL,
+               // The address
+               address,
+
+               NULL,
        };
 
        return td_source_run_command(source, argv, legacy_gateway_latency_on_success, source);