Skip to content

Make httpserver::error_log consume and apply va_list. #298

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

Merged
etr merged 3 commits into from
Mar 6, 2023
Merged

Make httpserver::error_log consume and apply va_list. #298

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0fd040
Make httpserver::error_log consume an apply va_list ap so that it gen…
bcsgh Feb 14, 2023
bbf2e8b
Try to clean up va_list_usedBeforeStarted, va_start_subsequentCalls a…
bcsgh Feb 14, 2023
c6068b0
Try to clean up va_list_usedBeforeStarted & va_start_subsequentCalls.
bcsgh Feb 14, 2023
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
22 changes: 18 additions & 4 deletions src/webserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,25 @@ void* uri_log(void* cls, const char* uri) {
}

void error_log(void* cls, const char* fmt, va_list ap) {
// Parameter needed to respect MHD interface, but not needed here.
std::ignore = ap;

webserver* dws = static_cast<webserver*>(cls);
if (dws->log_error != nullptr) dws->log_error(fmt);

std::string msg;
msg.resize(80); // Asssume one line will be enought most of the time.

va_list va;
va_copy(va, ap); // Stash a copy in case we need to try again.

size_t r = vsnprintf(&*msg.begin(), msg.size(), fmt, ap);
va_end(ap);

if (msg.size() < r) {
msg.resize(r);
r = vsnprintf(&*msg.begin(), msg.size(), fmt, va);
}
va_end(va);
msg.resize(r);

if (dws->log_error != nullptr) dws->log_error(msg);
}

void access_log(webserver* dws, string uri) {
Expand Down