Skip to content

Add public print method that takes va_list instead of a variable number of arguments #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add public print method that takes va_list instead of a variable number of arguments #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/Arduino_DebugUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,23 @@ void Arduino_DebugUtils::timestampOff() {

void Arduino_DebugUtils::print(int const debug_level, const char * fmt, ...)
{
if (!shouldPrint(debug_level))
return;

if (_print_debug_label)
printDebugLabel(debug_level);
va_list args;
va_start(args, fmt);
print(debug_level, fmt, args);
va_end(args);
}

if (_timestamp_on)
printTimestamp();
void Arduino_DebugUtils::print(int const debug_level, const __FlashStringHelper * fmt, ...)
{
String fmt_str(fmt);

va_list args;
va_start(args, fmt);
vPrint(fmt, args);
print(debug_level, fmt_str.c_str(), args);
va_end(args);
}

void Arduino_DebugUtils::print(int const debug_level, const __FlashStringHelper * fmt, ...)
void Arduino_DebugUtils::print(int const debug_level, const char * fmt, va_list args)
{
if (!shouldPrint(debug_level))
return;
Expand All @@ -117,12 +118,7 @@ void Arduino_DebugUtils::print(int const debug_level, const __FlashStringHelper
if (_timestamp_on)
printTimestamp();

String fmt_str(fmt);

va_list args;
va_start(args, fmt);
vPrint(fmt_str.c_str(), args);
va_end(args);
vPrint(fmt, args);
}

/******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/Arduino_DebugUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Arduino_DebugUtils {

void print(int const debug_level, const char * fmt, ...);
void print(int const debug_level, const __FlashStringHelper * fmt, ...);

void print(int const debug_level, const char * fmt, va_list args);

private:

Expand Down