Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-08 08:29:51 +00:00
Code Issues Projects Releases Wiki Activity

Avoid strerror(errno) spam in logs

Browse Source
This commit is contained in:
Aaron Culliney 2019-06-28 20:06:34 -07:00
parent e8e3110d18
commit 348eeb1f09
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/meta/log.h
View File

@ -50,15 +50,8 @@ void log_outputString(const char * const str);
#define _LOG(...) \ #define _LOG(...) \
do { \ do { \
int _err = errno; \
errno = 0; \
\
char *syserr_str = NULL; \
char *glerr_str = NULL; \ char *glerr_str = NULL; \
int ignored; \ int ignored; \
if (_err) { \
ignored = asprintf(&syserr_str, " (syserr:%s)", strerror(_err)); \
} \
if (_glerr) { \ if (_glerr) { \
ignored = asprintf(&glerr_str, " (glerr:%04X)", _glerr); \ ignored = asprintf(&glerr_str, " (glerr:%04X)", _glerr); \
} \ } \
@ -67,16 +60,13 @@ void log_outputString(const char * const str);
ignored = asprintf(&buf0, __VA_ARGS__); \ ignored = asprintf(&buf0, __VA_ARGS__); \
\ \
char *buf = NULL; \ char *buf = NULL; \
ignored = asprintf(&buf, "%s:%d (%s) -%s%s %s", _MYFILE_, __LINE__, __func__, (syserr_str ? : ""), (glerr_str ? : ""), buf0); \ ignored = asprintf(&buf, "%s:%d (%s) -%s %s", _MYFILE_, __LINE__, __func__, (glerr_str ? : ""), buf0); \
(void)ignored; \ (void)ignored; \
\ \
log_outputString(buf); \ log_outputString(buf); \
\ \
free(buf0); \ free(buf0); \
free(buf); \ free(buf); \
if (syserr_str) { \
free(syserr_str); \
} \
if (glerr_str) { \ if (glerr_str) { \
free(glerr_str); \ free(glerr_str); \
} \ } \
@ -125,15 +115,6 @@ void log_outputString(const char * const str);
} \ } \
} // } //
#define RELEASE_LOG(...) \
if (LIKELY(do_logging)) { \
GLenum _glerr = safeGLGetError(); \
_LOG(__VA_ARGS__); \
while ( (_glerr = safeGLGetError()) ) { \
_LOG(__VA_ARGS__); \
} \
} //
#define QUIT_FUNCTION(x) exit(x) #define QUIT_FUNCTION(x) exit(x)
#define ERRQUIT(...) \ #define ERRQUIT(...) \