From 5dca9843dc1e1dc6120536a0c37e8b51d0ec6880 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 27 Mar 2019 20:57:12 -0600
Subject: [PATCH] Fix use of trace macro when errno is imported
---
src/macros.rs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/macros.rs b/src/macros.rs
index 0d83ae13..e9ca07c1 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -76,26 +76,26 @@ macro_rules! trace_expr {
trace!("{}", format_args!($($arg)*));
#[allow(unused_unsafe)]
- let old_errno = unsafe { platform::errno };
+ let trace_old_errno = unsafe { platform::errno };
#[allow(unused_unsafe)]
unsafe { platform::errno = 0; }
let ret = $expr;
#[allow(unused_unsafe)]
- let errno = unsafe { platform::errno } as isize;
- if errno == 0 {
+ let trace_errno = unsafe { platform::errno } as isize;
+ if trace_errno == 0 {
#[allow(unused_unsafe)]
- unsafe { platform::errno = old_errno; }
+ unsafe { platform::errno = trace_old_errno; }
}
- let strerror = if errno >= 0 && errno < STR_ERROR.len() as isize {
- STR_ERROR[errno as usize]
+ let trace_strerror = if trace_errno >= 0 && trace_errno < STR_ERROR.len() as isize {
+ STR_ERROR[trace_errno as usize]
} else {
"Unknown error"
};
- trace!("{} = {} ({}, {})", format_args!($($arg)*), ret, errno, strerror);
+ trace!("{} = {} ({}, {})", format_args!($($arg)*), ret, trace_errno, trace_strerror);
ret
});
--
GitLab