Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Simplify errorf_errno a bit

Browse source
This commit is contained in:
Simon Ser 2021-08-25 18:16:44 +02:00
parent c3079f7f6c
commit 3b14c21afc
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/log.cpp
View file

@ -21,20 +21,20 @@ bool LogScope::has(enum LogPriority priority) {
return priority <= this->priority;
}
void LogScope::vprintf(enum LogPriority priority, const char *fmt, va_list args) {
void LogScope::vlogf(enum LogPriority priority, const char *fmt, va_list args) {
if (!this->has(priority)) {
return;
}
fprintf(stderr, "%s: ", this->name);
vfprintf(stderr, fmt, args);
fprintf(stderr, "\n");
}
void LogScope::vlogf(enum LogPriority priority, const char *fmt, va_list args) {
if (!this->has(priority)) {
return;
}
this->vprintf(priority, fmt, args);
fprintf(stderr, "\n");
void LogScope::logf(enum LogPriority priority, const char *fmt, ...) {
va_list args;
va_start(args, fmt);
this->vlogf(priority, fmt, args);
va_end(args);
}
void LogScope::errorf(const char *fmt, ...) {
@ -59,16 +59,13 @@ void LogScope::debugf(const char *fmt, ...) {
}
void LogScope::errorf_errno(const char *fmt, ...) {
if (!this->has(LOG_ERROR)) {
return;
}
const char *err = strerror(errno);
static char buf[1024];
va_list args;
va_start(args, fmt);
this->vprintf(LOG_ERROR, fmt, args);
vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
fprintf(stderr, ": %s\n", err);
this->logf(LOG_ERROR, "%s: %s", buf, err);
}

1
src/log.hpp
View file

@ -20,6 +20,7 @@ class LogScope {
bool has(enum LogPriority priority);
void vprintf(enum LogPriority priority, const char *fmt, va_list args) ATTRIB_PRINTF(3, 0);
void vlogf(enum LogPriority priority, const char *fmt, va_list args) ATTRIB_PRINTF(3, 0);
void logf(enum LogPriority priority, const char *fmt, ...) ATTRIB_PRINTF(3, 4);
public:
LogScope(const char *name);

2
src/rendervulkan.cpp
View file

@ -130,7 +130,7 @@ static void vk_errorf(VkResult result, const char *fmt, ...) {
static char buf[1024];
va_list args;
va_start(args, fmt);
snprintf(buf, sizeof(buf), fmt, args);
vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
vk_log.errorf("%s (VkResult: %d)", buf, result);