proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 12:44:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11118 from opensourcerouting/time-fmt-nulls

Browse Source 
lib: format NULL timevals correctly
This commit is contained in:
Donald Sharp 2022-04-29 10:00:05 -04:00 committed by GitHub
commit 9ad0725081
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/strformat.c
View File

@ -361,6 +361,8 @@ static ssize_t printfrr_abstime(struct fbuf *buf, struct printfrr_eargs *ea,
if (flags & TIMEFMT_SKIP) if (flags & TIMEFMT_SKIP)
return 0; return 0;
if (!ts)
return bputch(buf, '-');
if (flags & TIMEFMT_REALTIME) if (flags & TIMEFMT_REALTIME)
*real_ts = *ts; *real_ts = *ts;
@ -452,6 +454,8 @@ static ssize_t printfrr_reltime(struct fbuf *buf, struct printfrr_eargs *ea,
if (flags & TIMEFMT_SKIP) if (flags & TIMEFMT_SKIP)
return 0; return 0;
if (!ts)
return bputch(buf, '-');
if (flags & TIMEFMT_ABSOLUTE) { if (flags & TIMEFMT_ABSOLUTE) {
struct timespec anchor[1]; struct timespec anchor[1];
@ -561,8 +565,6 @@ static ssize_t printfrr_ts(struct fbuf *buf, struct printfrr_eargs *ea,
{ {
const struct timespec *ts = vptr; const struct timespec *ts = vptr;
if (!ts)
return bputs(buf, "(null)");
return printfrr_time(buf, ea, ts, 0); return printfrr_time(buf, ea, ts, 0);
} }
@ -574,7 +576,7 @@ static ssize_t printfrr_tv(struct fbuf *buf, struct printfrr_eargs *ea,
struct timespec ts; struct timespec ts;
if (!tv) if (!tv)
return bputs(buf, "(null)"); return printfrr_time(buf, ea, NULL, 0);
ts.tv_sec = tv->tv_sec; ts.tv_sec = tv->tv_sec;
ts.tv_nsec = tv->tv_usec * 1000; ts.tv_nsec = tv->tv_usec * 1000;
@ -589,7 +591,7 @@ static ssize_t printfrr_tt(struct fbuf *buf, struct printfrr_eargs *ea,
struct timespec ts; struct timespec ts;
if (!tt) if (!tt)
return bputs(buf, "(null)"); return printfrr_time(buf, ea, NULL, TIMEFMT_SECONDS);
ts.tv_sec = *tt; ts.tv_sec = *tt;
ts.tv_nsec = 0; ts.tv_nsec = 0;