Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / strformat.c

diff --git a/lib/strformat.c b/lib/strformat.c
index 7903e87ead2ca51c229bd58b9f2da70bbd517617..87d1715d262c9948bcf51bb124ca07f81678f8fa 100644 (file)
--- a/lib/strformat.c
+++ b/lib/strformat.c
@@ -1,17 +1,6 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2019  David Lamparter, for NetDEF, Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +16,7 @@
 #include "printfrr.h"
 #include "monotime.h"
 
-printfrr_ext_autoreg_p("HX", printfrr_hexdump)
+printfrr_ext_autoreg_p("HX", printfrr_hexdump);
 static ssize_t printfrr_hexdump(struct fbuf *buf, struct printfrr_eargs *ea,
                                const void *ptr)
 {
@@ -58,7 +47,7 @@ static ssize_t printfrr_hexdump(struct fbuf *buf, struct printfrr_eargs *ea,
 
 /* string analog for hexdumps / the "this." in ("74 68 69 73 0a  |this.|") */
 
-printfrr_ext_autoreg_p("HS", printfrr_hexdstr)
+printfrr_ext_autoreg_p("HS", printfrr_hexdstr);
 static ssize_t printfrr_hexdstr(struct fbuf *buf, struct printfrr_eargs *ea,
                                const void *ptr)
 {
@@ -201,7 +190,7 @@ static ssize_t bquote(struct fbuf *buf, const uint8_t *pos, size_t len,
        return ret;
 }
 
-printfrr_ext_autoreg_p("SE", printfrr_escape)
+printfrr_ext_autoreg_p("SE", printfrr_escape);
 static ssize_t printfrr_escape(struct fbuf *buf, struct printfrr_eargs *ea,
                               const void *vptr)
 {
@@ -226,7 +215,7 @@ static ssize_t printfrr_escape(struct fbuf *buf, struct printfrr_eargs *ea,
        return bquote(buf, ptr, len, ESC_ALL);
 }
 
-printfrr_ext_autoreg_p("SQ", printfrr_quote)
+printfrr_ext_autoreg_p("SQ", printfrr_quote);
 static ssize_t printfrr_quote(struct fbuf *buf, struct printfrr_eargs *ea,
                              const void *vptr)
 {
@@ -361,6 +350,8 @@ static ssize_t printfrr_abstime(struct fbuf *buf, struct printfrr_eargs *ea,
 
        if (flags & TIMEFMT_SKIP)
                return 0;
+       if (!ts)
+               return bputch(buf, '-');
 
        if (flags & TIMEFMT_REALTIME)
                *real_ts = *ts;
@@ -452,6 +443,8 @@ static ssize_t printfrr_reltime(struct fbuf *buf, struct printfrr_eargs *ea,
 
        if (flags & TIMEFMT_SKIP)
                return 0;
+       if (!ts)
+               return bputch(buf, '-');
 
        if (flags & TIMEFMT_ABSOLUTE) {
                struct timespec anchor[1];
@@ -555,18 +548,16 @@ static ssize_t printfrr_reltime(struct fbuf *buf, struct printfrr_eargs *ea,
        return ret;
 }
 
-printfrr_ext_autoreg_p("TS", printfrr_ts)
+printfrr_ext_autoreg_p("TS", printfrr_ts);
 static ssize_t printfrr_ts(struct fbuf *buf, struct printfrr_eargs *ea,
                           const void *vptr)
 {
        const struct timespec *ts = vptr;
 
-       if (!ts)
-               return bputs(buf, "(null)");
        return printfrr_time(buf, ea, ts, 0);
 }
 
-printfrr_ext_autoreg_p("TV", printfrr_tv)
+printfrr_ext_autoreg_p("TV", printfrr_tv);
 static ssize_t printfrr_tv(struct fbuf *buf, struct printfrr_eargs *ea,
                           const void *vptr)
 {
@@ -574,14 +565,14 @@ static ssize_t printfrr_tv(struct fbuf *buf, struct printfrr_eargs *ea,
        struct timespec ts;
 
        if (!tv)
-               return bputs(buf, "(null)");
+               return printfrr_time(buf, ea, NULL, 0);
 
        ts.tv_sec = tv->tv_sec;
        ts.tv_nsec = tv->tv_usec * 1000;
        return printfrr_time(buf, ea, &ts, 0);
 }
 
-printfrr_ext_autoreg_p("TT", printfrr_tt)
+printfrr_ext_autoreg_p("TT", printfrr_tt);
 static ssize_t printfrr_tt(struct fbuf *buf, struct printfrr_eargs *ea,
                           const void *vptr)
 {
@@ -589,7 +580,7 @@ static ssize_t printfrr_tt(struct fbuf *buf, struct printfrr_eargs *ea,
        struct timespec ts;
 
        if (!tt)
-               return bputs(buf, "(null)");
+               return printfrr_time(buf, ea, NULL, TIMEFMT_SECONDS);
 
        ts.tv_sec = *tt;
        ts.tv_nsec = 0;