Merge branch 'master' into topic/jsiwek/supervisor

This commit is contained in:
Jon Siwek 2020-01-07 14:55:51 -08:00
commit 6046da9993
314 changed files with 3709 additions and 5389 deletions

View file

@ -61,7 +61,7 @@ const char* BasicThread::Fmt(const char* format, ...)
va_list al;
va_start(al, format);
int n = safe_vsnprintf(buf, buf_len, format, al);
int n = vsnprintf(buf, buf_len, format, al);
va_end(al);
if ( (unsigned int) n >= buf_len )
@ -71,7 +71,7 @@ const char* BasicThread::Fmt(const char* format, ...)
// Is it portable to restart?
va_start(al, format);
n = safe_vsnprintf(buf, buf_len, format, al);
n = vsnprintf(buf, buf_len, format, al);
va_end(al);
}