diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-16 21:36:36 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-16 21:36:36 +0100 |
| commit | eb0c2e218ca1b0d733157bc2a11f8621d4ed2409 (patch) | |
| tree | 0507607659fb458a001d894cb4503c401bae48a9 /util-linux | |
| parent | d3c36882dc5bc5fcede9a45a6bc7a39570fba7d0 (diff) | |
libbb: introduce and use xsettimeofday()
function old new delta
xsettimeofday - 25 +25
rdate_main 274 260 -14
step_time 348 331 -17
set_kernel_timezone_and_clock 119 102 -17
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/3 up/down: 25/-48) Total: -23 bytes
text data bss dec hex filename
1020753 559 5052 1026364 fa93c busybox_old
1020708 559 5052 1026319 fa90f busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/hwclock.c | 6 | ||||
| -rw-r--r-- | util-linux/rdate.c | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 77aa2d7c3..dd66ec199 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c @@ -184,10 +184,8 @@ static void set_kernel_timezone_and_clock(int utc, const struct timeval *hctosys /*tz.tz_dsttime = 0; already is */ set_kernel_tz(&tz); /* MIGHT warp_clock() if 1st call since boot */ - if (hctosys) { /* it's --hctosys: set time too */ - if (settimeofday(hctosys, NULL)) - bb_simple_perror_msg_and_die("settimeofday"); - } + if (hctosys) /* it's --hctosys: set time too */ + xsettimeofday(hctosys); } static void to_sys_clock(const char **pp_rtcname, int utc) diff --git a/util-linux/rdate.c b/util-linux/rdate.c index bb1dc519a..9b80141c9 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c @@ -96,11 +96,10 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) if (time(NULL) == remote_time) bb_simple_error_msg("current time matches remote time"); else { - struct timespec ts; + struct timeval ts; ts.tv_sec = remote_time; - ts.tv_nsec = 0; - if (clock_settime(CLOCK_REALTIME, &ts) < 0) - bb_simple_perror_msg_and_die("can't set time of day"); + ts.tv_usec = 0; + xsettimeofday(&ts); } } |