aboutsummaryrefslogtreecommitdiff
path: root/src/common/compat.c
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2014-10-26 14:43:55 +1100
committerteor <teor2345@gmail.com>2014-10-30 22:34:46 +1100
commit13298d90a90dc62d21d38f910171c9b57a8f0273 (patch)
treedf91745009bef0a26901438d361036f039e9b00f /src/common/compat.c
parentacc392856d255059949bb22d2daf56c61f3fd76d (diff)
downloadtor-13298d90a90dc62d21d38f910171c9b57a8f0273.tar.gz
tor-13298d90a90dc62d21d38f910171c9b57a8f0273.zip
Silence spurious clang warnings
Silence clang warnings under --enable-expensive-hardening, including: + implicit truncation of 64 bit values to 32 bit; + const char assignment to self; + tautological compare; and + additional parentheses around equality tests. (gcc uses these to silence assignment, so clang warns when they're present in an equality test. But we need to use extra parentheses in macros to isolate them from other code).
Diffstat (limited to 'src/common/compat.c')
-rw-r--r--src/common/compat.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/common/compat.c b/src/common/compat.c
index 0c048928d7..e4758aaf88 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -138,9 +138,10 @@ int
tor_open_cloexec(const char *path, int flags, unsigned mode)
{
int fd;
+ const char *p = path;
#ifdef O_CLOEXEC
- path = sandbox_intern_string(path);
- fd = open(path, flags|O_CLOEXEC, mode);
+ p = sandbox_intern_string(path);
+ fd = open(p, flags|O_CLOEXEC, mode);
if (fd >= 0)
return fd;
/* If we got an error, see if it is EINVAL. EINVAL might indicate that,
@@ -150,8 +151,8 @@ tor_open_cloexec(const char *path, int flags, unsigned mode)
return -1;
#endif
- log_debug(LD_FS, "Opening %s with flags %x", path, flags);
- fd = open(path, flags, mode);
+ log_debug(LD_FS, "Opening %s with flags %x", p, flags);
+ fd = open(p, flags, mode);
#ifdef FD_CLOEXEC
if (fd >= 0) {
if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {