[COMMITTED,1/2] tst_safe_macros: SAFE_{IOCTL, FCNTL} prefix variable
diff mbox series

Message ID 20180416145140.10547-1-chrubis@suse.cz
State Accepted
Delegated to: Cyril Hrubis
Headers show
Series
  • [COMMITTED,1/2] tst_safe_macros: SAFE_{IOCTL, FCNTL} prefix variable
Related show

Commit Message

Cyril Hrubis April 16, 2018, 2:51 p.m. UTC
Prefix local variable ret with tst_ to avoid accidental aliasing.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 include/tst_safe_macros.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Patch
diff mbox series

diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
index f115a7baf..b4aa46705 100644
--- a/include/tst_safe_macros.h
+++ b/include/tst_safe_macros.h
@@ -201,18 +201,18 @@  pid_t safe_getpgid(const char *file, const int lineno, pid_t pid);
 	safe_readdir(__FILE__, __LINE__, NULL, (dirp))
 
 #define SAFE_IOCTL(fd, request, ...)                         \
-	({int ret = ioctl(fd, request, ##__VA_ARGS__);       \
-	  ret < 0 ?                                          \
+	({int tst_ret_ = ioctl(fd, request, ##__VA_ARGS__);  \
+	  tst_ret_ < 0 ?                                     \
 	   tst_brk(TBROK | TERRNO,                           \
 	            "ioctl(%i,%s,...) failed", fd, #request) \
-	 : ret;})
+	 : tst_ret_;})
 
 #define SAFE_FCNTL(fd, cmd, ...)                            \
-	({int ret = fcntl(fd, cmd, ##__VA_ARGS__);          \
-	  ret == -1 ?                                       \
+	({int tst_ret_ = fcntl(fd, cmd, ##__VA_ARGS__);     \
+	  tst_ret_ == -1 ?                                  \
 	   tst_brk(TBROK | TERRNO,                          \
 	            "fcntl(%i,%s,...) failed", fd, #cmd), 0 \
-	 : ret;})
+	 : tst_ret_;})
 
 /*
  * following functions are inline because the behaviour may depend on