From af96e52be9e8d939d5cb7d83c0ee3474b80cabfe Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Tue, 14 Sep 2021 03:25:58 -0400 Subject: [PATCH] [core] quiet coverity warnings --- src/fdlog.c | 2 +- src/fdlog_maint.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/fdlog.c b/src/fdlog.c index 43ab96bc..e9bcdeb6 100644 --- a/src/fdlog.c +++ b/src/fdlog.c @@ -21,7 +21,7 @@ fdlog_init (const char * const fn, const int fd, const int mode) void fdlog_free (fdlog_st * const fdlog) { - if (fdlog->fd != STDERR_FILENO) + if (fdlog->fd > STDERR_FILENO) close(fdlog->fd); free(fdlog->b.ptr); free(fdlog); diff --git a/src/fdlog_maint.c b/src/fdlog_maint.c index b71abf6c..470e5e11 100644 --- a/src/fdlog_maint.c +++ b/src/fdlog_maint.c @@ -281,15 +281,16 @@ fdlog_files_cycle (fdlog_st * const errh) fdlog_st * const fdlog = fdlog_files.ptr[i]; int fd = fdlog_file_open_fd(fdlog->fn); if (-1 != fd) { - if (fdlog->fd != STDERR_FILENO) { + if (fdlog->fd > STDERR_FILENO) { close(fdlog->fd); fdlog->fd = fd; } - else if (STDERR_FILENO == dup2(fd, STDERR_FILENO)) + else { + if (fdlog->fd != dup2(fd, fdlog->fd)) + log_perror(errh, __FILE__, __LINE__, + "dup2() %s to %d", fdlog->fn, fdlog->fd); close(fd); - else - log_perror(errh, __FILE__, __LINE__, - "dup2() %s to STDERR", fdlog->fn); + } } else { log_perror(errh, __FILE__, __LINE__,