From 520b0384fd8f778153b82b532c711218748cc822 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 23 Dec 2015 12:25:56 -0200 Subject: [PATCH] AP_HAL: remove unused in_progmem flag to print_vprintf --- libraries/AP_HAL/UARTDriver.cpp | 2 +- libraries/AP_HAL/Util.cpp | 2 +- libraries/AP_HAL/utility/print_vprintf.cpp | 2 +- libraries/AP_HAL/utility/print_vprintf.h | 10 +++------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libraries/AP_HAL/UARTDriver.cpp b/libraries/AP_HAL/UARTDriver.cpp index 7ad7623999..337445c176 100644 --- a/libraries/AP_HAL/UARTDriver.cpp +++ b/libraries/AP_HAL/UARTDriver.cpp @@ -35,5 +35,5 @@ void AP_HAL::UARTDriver::printf(const char *fmt, ...) void AP_HAL::UARTDriver::vprintf(const char *fmt, va_list ap) { - print_vprintf((AP_HAL::Print*)this, 0, fmt, ap); + print_vprintf(this, fmt, ap); } diff --git a/libraries/AP_HAL/Util.cpp b/libraries/AP_HAL/Util.cpp index 0a6a524abd..cdd4d24337 100644 --- a/libraries/AP_HAL/Util.cpp +++ b/libraries/AP_HAL/Util.cpp @@ -40,7 +40,7 @@ int AP_HAL::Util::snprintf(char* str, size_t size, const char *format, ...) int AP_HAL::Util::vsnprintf(char* str, size_t size, const char *format, va_list ap) { BufferPrinter buf(str, size); - print_vprintf(&buf, 0, format, ap); + print_vprintf(&buf, format, ap); // null terminate if possible int ret = buf._offs; buf.write(0); diff --git a/libraries/AP_HAL/utility/print_vprintf.cpp b/libraries/AP_HAL/utility/print_vprintf.cpp index 4b177f3979..0353719053 100644 --- a/libraries/AP_HAL/utility/print_vprintf.cpp +++ b/libraries/AP_HAL/utility/print_vprintf.cpp @@ -67,7 +67,7 @@ #define FL_FLTEXP FL_PREC #define FL_FLTFIX FL_LONG -void print_vprintf(AP_HAL::Print *s, unsigned char in_progmem, const char *fmt, va_list ap) +void print_vprintf(AP_HAL::Print *s, const char *fmt, va_list ap) { unsigned char c; /* holds a char from the format string */ uint16_t flags; diff --git a/libraries/AP_HAL/utility/print_vprintf.h b/libraries/AP_HAL/utility/print_vprintf.h index ea7751f7d5..c165566b8f 100644 --- a/libraries/AP_HAL/utility/print_vprintf.h +++ b/libraries/AP_HAL/utility/print_vprintf.h @@ -1,11 +1,7 @@ +#pragma once -#ifndef __AP_HAL_UTILITY_VPRINTF_H__ -#define __AP_HAL_UTILITY_VPRINTF_H__ - -#include #include -void print_vprintf (AP_HAL::Print *s, unsigned char in_progmem, const char *fmt, va_list ap); - +#include -#endif //__AP_HAL_UTILITY_VPRINTF_H__ +void print_vprintf(AP_HAL::Print *s, const char *fmt, va_list ap);