Fix Print::printf implementation

h2zero · Jan 15, 2025 · 4e203bb · 4e203bb
1 parent 893df5c
commit 4e203bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/cores/nRF5/Print.cpp b/cores/nRF5/Print.cpp
@@ -187,13 +187,19 @@ size_t Print::println(const Printable& x)
   return n;
 }
 
-int Print::printf(const char* format, ...)
+size_t Print::printf(const char * format, ...)
 {
-  va_list va;
-  va_start(va, format);
-  int ret = vprintf(format, va);
-  va_end(va);
-  return ret;
+  char buf[256];
+  int len;
+
+  va_list ap;
+  va_start(ap, format);
+
+  len = vsnprintf(buf, 256, format, ap);
+  this->write(buf, len);
+
+  va_end(ap);
+  return len;
 }
 
 // Private Methods /////////////////////////////////////////////////////////////

diff --git a/cores/nRF5/Print.h b/cores/nRF5/Print.h
@@ -83,7 +83,7 @@ class Print
     size_t println(double, int = 2);
     size_t println(const Printable&);
     size_t println(void);
-    int    printf(const char* format, ...) __attribute__ ((format (printf, 2, 3)));
+    size_t printf(const char* format, ...) __attribute__ ((format (printf, 2, 3)));
 
     virtual void flush() { /* Empty implementation for backward compatibility */ }