diff options
author | Lennart Poettering <lennart@poettering.net> | 2020-07-28 11:18:26 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2020-07-28 11:24:55 +0200 |
commit | 39cf0351c529584aa8f270e3b418d7ab9461b622 (patch) | |
tree | 11c5fcdc23e9f6f8b9d9782878fd542fa42f3f2c /src/libsystemd-network/test-ndisc-rs.c | |
parent | 4c5e74f71be6dab3d064690672cb84737b198be5 (diff) | |
download | systemd-39cf0351c529584aa8f270e3b418d7ab9461b622.tar.gz |
tree-wide: make use of new relative time events in sd-event.h
Diffstat (limited to 'src/libsystemd-network/test-ndisc-rs.c')
-rw-r--r-- | src/libsystemd-network/test-ndisc-rs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c index 5d1e66fcdc..db617f93fc 100644 --- a/src/libsystemd-network/test-ndisc-rs.c +++ b/src/libsystemd-network/test-ndisc-rs.c @@ -272,7 +272,6 @@ static void test_callback(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *r static void test_rs(void) { sd_event *e; sd_ndisc *nd; - usec_t time_now = now(clock_boottime_or_monotonic()); if (verbose) printf("* %s\n", __FUNCTION__); @@ -290,9 +289,10 @@ static void test_rs(void) { assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0); assert_se(sd_ndisc_set_callback(nd, test_callback, e) >= 0); - assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), - time_now + 2 *USEC_PER_SEC, 0, - test_rs_hangcheck, NULL) >= 0); + assert_se(sd_event_add_time_relative( + e, &test_hangcheck, clock_boottime_or_monotonic(), + 2 *USEC_PER_SEC, 0, + test_rs_hangcheck, NULL) >= 0); assert_se(sd_ndisc_stop(nd) >= 0); assert_se(sd_ndisc_start(nd) >= 0); @@ -373,7 +373,6 @@ static int test_timeout_value(uint8_t flags) { static void test_timeout(void) { sd_event *e; sd_ndisc *nd; - usec_t time_now = now(clock_boottime_or_monotonic()); if (verbose) printf("* %s\n", __FUNCTION__); @@ -392,9 +391,10 @@ static void test_timeout(void) { assert_se(sd_ndisc_set_ifindex(nd, 42) >= 0); assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0); - assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), - time_now + 2U * USEC_PER_SEC, 0, - test_rs_hangcheck, NULL) >= 0); + assert_se(sd_event_add_time_relative( + e, &test_hangcheck, clock_boottime_or_monotonic(), + 2U * USEC_PER_SEC, 0, + test_rs_hangcheck, NULL) >= 0); assert_se(sd_ndisc_start(nd) >= 0); |