Browse Source

AP_HAL: remove unused in_progmem flag to print_vprintf

mission-4.1.18
Lucas De Marchi 9 years ago
parent
commit
520b0384fd
  1. 2
      libraries/AP_HAL/UARTDriver.cpp
  2. 2
      libraries/AP_HAL/Util.cpp
  3. 2
      libraries/AP_HAL/utility/print_vprintf.cpp
  4. 10
      libraries/AP_HAL/utility/print_vprintf.h

2
libraries/AP_HAL/UARTDriver.cpp

@ -35,5 +35,5 @@ void AP_HAL::UARTDriver::printf(const char *fmt, ...) @@ -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);
}

2
libraries/AP_HAL/Util.cpp

@ -40,7 +40,7 @@ int AP_HAL::Util::snprintf(char* str, size_t size, const char *format, ...) @@ -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);

2
libraries/AP_HAL/utility/print_vprintf.cpp

@ -67,7 +67,7 @@ @@ -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;

10
libraries/AP_HAL/utility/print_vprintf.h

@ -1,11 +1,7 @@ @@ -1,11 +1,7 @@
#pragma once
#ifndef __AP_HAL_UTILITY_VPRINTF_H__
#define __AP_HAL_UTILITY_VPRINTF_H__
#include <AP_HAL/AP_HAL.h>
#include <stdarg.h>
void print_vprintf (AP_HAL::Print *s, unsigned char in_progmem, const char *fmt, va_list ap);
#include <AP_HAL/AP_HAL.h>
#endif //__AP_HAL_UTILITY_VPRINTF_H__
void print_vprintf(AP_HAL::Print *s, const char *fmt, va_list ap);

Loading…
Cancel
Save