diff --git a/libraries/AP_HAL/Util.cpp b/libraries/AP_HAL/Util.cpp index 71bd14d2a8..0a6a524abd 100644 --- a/libraries/AP_HAL/Util.cpp +++ b/libraries/AP_HAL/Util.cpp @@ -37,16 +37,6 @@ int AP_HAL::Util::snprintf(char* str, size_t size, const char *format, ...) return res; } -int AP_HAL::Util::snprintf_P(char* str, size_t size, const prog_char_t *format, ...) -{ - va_list ap; - va_start(ap, format); - int res = vsnprintf_P(str, size, format, ap); - va_end(ap); - return res; -} - - int AP_HAL::Util::vsnprintf(char* str, size_t size, const char *format, va_list ap) { BufferPrinter buf(str, size); @@ -56,14 +46,3 @@ int AP_HAL::Util::vsnprintf(char* str, size_t size, const char *format, va_list buf.write(0); return ret; } - -int AP_HAL::Util::vsnprintf_P(char* str, size_t size, const prog_char_t *format, - va_list ap) -{ - BufferPrinter buf(str, size); - print_vprintf(&buf, 1,(const char*) format, ap); - int ret = buf._offs; - // null terminate if possible - buf.write(0); - return ret; -} diff --git a/libraries/AP_HAL/Util.h b/libraries/AP_HAL/Util.h index 42bfd27290..adb927b70b 100644 --- a/libraries/AP_HAL/Util.h +++ b/libraries/AP_HAL/Util.h @@ -4,22 +4,15 @@ #include #include "AP_HAL_Namespace.h" -#include class AP_HAL::Util { public: int snprintf(char* str, size_t size, const char *format, ...); - int snprintf_P(char* str, size_t size, - const prog_char_t *format, ...); - int vsnprintf(char* str, size_t size, const char *format, va_list ap); - int vsnprintf_P(char* str, size_t size, - const prog_char_t *format, va_list ap); - void set_soft_armed(const bool b) { soft_armed = b; } bool get_soft_armed() const { return soft_armed; }