From: Ronnie Sahlberg Date: Wed, 16 Jul 2014 22:23:01 GMT Subject: [PATCH 01/12] wrapper.c: simplify warn_if_unremovable Message-ID: <1405549392-27306-2-git-send-email-sahlberg@google.com> In-Reply-To: <1405549392-27306-1-git-send-email-sahlberg@google.com> Signed-off-by: Ronnie Sahlberg --- wrapper.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/wrapper.c b/wrapper.c index bc1bfb8..740e193 100644 --- a/wrapper.c +++ b/wrapper.c @@ -429,14 +429,12 @@ int xmkstemp_mode(char *template, int mode) static int warn_if_unremovable(const char *op, const char *file, int rc) { - if (rc < 0) { - int err = errno; - if (ENOENT != err) { - warning("unable to %s %s: %s", - op, file, strerror(errno)); - errno = err; - } - } + int err; + if (rc >= 0 || errno == ENOENT) + return rc; + err = errno; + warning("unable to %s %s: %s", op, file, strerror(errno)); + errno = err; return rc; } -- 2.0.1.527.gc6b782e