X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fformat.c;h=b67553c6f2db17436d2f7c077c522af59cf3db81;hb=e46bd4cac4b80c553d39dbc2a06e5dd3f8eef671;hp=886f03d9c5f78702ce1a54e9691b7a443ab3f952;hpb=b7b929931a07fbb27b43d5cd105f366c3e29807e;p=vpp.git diff --git a/src/vppinfra/format.c b/src/vppinfra/format.c index 886f03d9c5f..b67553c6f2d 100644 --- a/src/vppinfra/format.c +++ b/src/vppinfra/format.c @@ -383,7 +383,7 @@ done: return f; } -u8 * +__clib_export u8 * va_format (u8 * s, const char *fmt, va_list * va) { const u8 *f = (u8 *) fmt, *g; @@ -412,20 +412,29 @@ va_format (u8 * s, const char *fmt, va_list * va) if (f > g) vec_add (s, g, f - g); +#ifdef __COVERITY__ + if (s == 0) + return (u8 *) "liar liar pants on fire s can't be zero!"; +#endif + return s; } -u8 * +__clib_export u8 * format (u8 * s, const char *fmt, ...) { va_list va; va_start (va, fmt); s = va_format (s, fmt, &va); va_end (va); +#ifdef __COVERITY__ + if (s == 0) + return (u8 *) "liar liar pants on fire s can't be zero!"; +#endif return s; } -word +__clib_export word va_fformat (FILE * f, char *fmt, va_list * va) { word ret; @@ -449,7 +458,7 @@ va_fformat (FILE * f, char *fmt, va_list * va) return ret; } -word +__clib_export word fformat (FILE * f, char *fmt, ...) { va_list va; @@ -463,7 +472,7 @@ fformat (FILE * f, char *fmt, ...) } #ifdef CLIB_UNIX -void +__clib_export void fformat_append_cr (FILE * ofp, const char *fmt, ...) { va_list va; @@ -474,7 +483,7 @@ fformat_append_cr (FILE * ofp, const char *fmt, ...) fformat (ofp, "\n"); } -word +__clib_export word fdformat (int fd, char *fmt, ...) { word ret;