diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-03-17 11:47:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 11:47:15 +0100 |
| commit | 218326d04a05c6eb7575edc7169782457095d936 (patch) | |
| tree | be5e8040f6f8b9f36a5b7979331702b8a7dcc013 /ripngd | |
| parent | Merge pull request #5940 from patrasar/214257 (diff) | |
| parent | lib, *: add a common time interval formatting api (diff) | |
| download | frr-218326d04a05c6eb7575edc7169782457095d936.tar.xz frr-218326d04a05c6eb7575edc7169782457095d936.zip | |
Merge pull request #5927 from mjstapp/interval_string_api
lib, *: add a common time interval formatting api
Diffstat (limited to 'ripngd')
| -rw-r--r-- | ripngd/ripng_peer.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c index c038bfccf..e6ff58dd0 100644 --- a/ripngd/ripng_peer.c +++ b/ripngd/ripng_peer.c @@ -141,7 +141,6 @@ void ripng_peer_bad_packet(struct ripng *ripng, struct sockaddr_in6 *from) static char *ripng_peer_uptime(struct ripng_peer *peer, char *buf, size_t len) { time_t uptime; - struct tm tm; /* If there is no connection has been done before print `never'. */ if (peer->uptime == 0) { @@ -152,17 +151,9 @@ static char *ripng_peer_uptime(struct ripng_peer *peer, char *buf, size_t len) /* Get current time. */ uptime = time(NULL); uptime -= peer->uptime; - gmtime_r(&uptime, &tm); - - if (uptime < ONE_DAY_SECOND) - snprintf(buf, len, "%02d:%02d:%02d", tm.tm_hour, tm.tm_min, - tm.tm_sec); - else if (uptime < ONE_WEEK_SECOND) - snprintf(buf, len, "%dd%02dh%02dm", tm.tm_yday, tm.tm_hour, - tm.tm_min); - else - snprintf(buf, len, "%02dw%dd%02dh", tm.tm_yday / 7, - tm.tm_yday - ((tm.tm_yday / 7) * 7), tm.tm_hour); + + frrtime_to_interval(uptime, buf, len); + return buf; } |