From 741295eda6db5d31290909d99dbe0847d543657c Mon Sep 17 00:00:00 2001 From: Kichan Kwon Date: Mon, 8 Jun 2020 11:27:32 +0900 Subject: [PATCH] Unify the error checking of open() Change-Id: Id65ea98987c616e5fb481d0410b0a87960709619 Signed-off-by: Kichan Kwon --- upg-verifier/upg-verifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/upg-verifier/upg-verifier.c b/upg-verifier/upg-verifier.c index 8404c0c..7a32f9f 100644 --- a/upg-verifier/upg-verifier.c +++ b/upg-verifier/upg-verifier.c @@ -40,7 +40,7 @@ static bool check_signed_file(const char *path) _D("Signed file path : %s", path); signed_file_fd = open(path, O_RDONLY); - ASSERT_RETV(signed_file_fd > 0, false, "Failed to open %s : %m", path); + ASSERT_RETV(signed_file_fd != -1, false, "Failed to open %s : %m", path); // Read metadata offset = lseek(signed_file_fd, -metadata_size, SEEK_END); @@ -80,7 +80,7 @@ static int read_signed_file(const char *path) _D("Signed file path : %s", path); signed_file_fd = open(path, O_RDONLY); - ASSERT_RETV(signed_file_fd > 0, errno, "Failed to open %s : %m", path); + ASSERT_RETV(signed_file_fd != -1, errno, "Failed to open %s : %m", path); // Read data signed_file.delta = malloc(signed_file.delta_size); @@ -232,7 +232,7 @@ int main(int argc, char *argv[]) _CLEANUP_CLOSE_ int log_fd; log_fd = open("/opt/var/log/last_uv.log", O_WRONLY | O_CREAT, 0644); - ASSERT_RETV(log_fd >= 0, errno, "Failed to open log file fd : %m"); + ASSERT_RETV(log_fd != -1, errno, "Failed to open log file fd : %m"); ret = dup2(log_fd, STDOUT_FILENO); ASSERT_RETV(ret != -1, errno, "Failed to duplicate fd : %m"); -- 2.7.4