Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / printfrr.h

diff --git a/lib/printfrr.h b/lib/printfrr.h
index 8ea8fd69a7b6606cabe22d252e24d27115a1bebc..b8bef562d25c6fc1c775f45e1800634470023b66 100644 (file)
--- a/lib/printfrr.h
+++ b/lib/printfrr.h
@@ -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.
  */
 
 #ifndef _FRR_PRINTFRR_H
@@ -209,10 +198,11 @@ void printfrr_ext_reg(const struct printfrr_ext *);
                .print_ptr = print_fn,                                         \
        };                                                                     \
        static void _printreg_##print_fn(void) __attribute__((constructor));   \
-       static void _printreg_##print_fn(void) {                               \
+       static void _printreg_##print_fn(void)                                 \
+       {                                                                      \
                printfrr_ext_reg(&_printext_##print_fn);                       \
        }                                                                      \
-       /* end */
+       MACRO_REQUIRE_SEMICOLON()
 
 #define printfrr_ext_autoreg_i(matchs, print_fn)                               \
        static ssize_t print_fn(struct fbuf *, struct printfrr_eargs *,        \
@@ -222,12 +212,17 @@ void printfrr_ext_reg(const struct printfrr_ext *);
                .print_int = print_fn,                                         \
        };                                                                     \
        static void _printreg_##print_fn(void) __attribute__((constructor));   \
-       static void _printreg_##print_fn(void) {                               \
+       static void _printreg_##print_fn(void)                                 \
+       {                                                                      \
                printfrr_ext_reg(&_printext_##print_fn);                       \
        }                                                                      \
-       /* end */
+       MACRO_REQUIRE_SEMICOLON()
 
-/* fbuf helper functions */
+/* fbuf helper functions - note all 3 of these return the length that would
+ * be written regardless of how much space was available in the buffer, as
+ * needed for implementing printfrr extensions.  (They also accept NULL buf
+ * for that.)
+ */
 
 static inline ssize_t bputs(struct fbuf *buf, const char *str)
 {
@@ -251,6 +246,17 @@ static inline ssize_t bputch(struct fbuf *buf, char ch)
        return 1;
 }
 
+static inline ssize_t bputhex(struct fbuf *buf, uint8_t val)
+{
+       static const char hexch[] = "0123456789abcdef";
+
+       if (buf && buf->pos < buf->buf + buf->len)
+               *buf->pos++ = hexch[(val >> 4) & 0xf];
+       if (buf && buf->pos < buf->buf + buf->len)
+               *buf->pos++ = hexch[val & 0xf];
+       return 2;
+}
+
 /* %pVA extension, equivalent to Linux kernel %pV */
 
 struct va_format {
@@ -261,6 +267,20 @@ struct va_format {
 #ifdef _FRR_ATTRIBUTE_PRINTFRR
 #pragma FRR printfrr_ext "%pFB" (struct fbuf *)
 #pragma FRR printfrr_ext "%pVA" (struct va_format *)
+
+#pragma FRR printfrr_ext "%pHX" (signed char *)
+#pragma FRR printfrr_ext "%pHX" (unsigned char *)
+#pragma FRR printfrr_ext "%pHX" (void *)
+#pragma FRR printfrr_ext "%pHS" (signed char *)
+#pragma FRR printfrr_ext "%pHS" (unsigned char *)
+#pragma FRR printfrr_ext "%pHS" (void *)
+
+#pragma FRR printfrr_ext "%pSE" (char *)
+#pragma FRR printfrr_ext "%pSQ" (char *)
+
+#pragma FRR printfrr_ext "%pTS" (struct timespec *)
+#pragma FRR printfrr_ext "%pTV" (struct timeval *)
+#pragma FRR printfrr_ext "%pTT" (time_t *)
 #endif
 
 /* when using non-ISO-C compatible extension specifiers... */
@@ -280,8 +300,8 @@ struct va_format {
 
 #define FMT_NSTD(expr)                                                         \
        ({                                                                     \
-               typeof(expr) _v;                                               \
                FMT_NSTD_BEGIN                                                 \
+               typeof(expr) _v;                                               \
                _v = expr;                                                     \
                FMT_NSTD_END                                                   \
                _v;                                                            \