mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-30 11:10:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1639 from taiyu-len/save_errno

Browse source 
save errno to avoid issues with it being overwritten in sway_log_errno
This commit is contained in:
Drew DeVault 2018-03-27 22:55:08 -04:00 • committed by GitHub
commit f99a653bd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/log.c
View file

@ -127,6 +127,7 @@ void _sway_abort(const char *filename, int line, const char* format, ...) {
} }
void sway_log_errno(log_importance_t verbosity, char* format, ...) { void sway_log_errno(log_importance_t verbosity, char* format, ...) {
int errsv = errno;
if (verbosity <= v) { if (verbosity <= v) {
unsigned int c = verbosity; unsigned int c = verbosity;
if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) { if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
@ -145,13 +146,14 @@ void sway_log_errno(log_importance_t verbosity, char* format, ...) {
va_end(args); va_end(args);
fprintf(stderr, ": "); fprintf(stderr, ": ");
fprintf(stderr, "%s", strerror(errno)); fprintf(stderr, "%s", strerror(errsv));
if (colored && isatty(STDERR_FILENO)) { if (colored && isatty(STDERR_FILENO)) {
fprintf(stderr, "\x1B[0m"); fprintf(stderr, "\x1B[0m");
} }
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
errno = errsv;
} }
bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) { bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) {