From 25a7791d34f8c954bfa7091ab12ff99c8242efdc Mon Sep 17 00:00:00 2001 From: disconnect3d Date: Sat, 24 Nov 2018 16:23:45 +0100 Subject: [PATCH] Fix utils::writeToFd return type The `writeToFd` function in `util.cc` returns `ssize_t` but the only returned values are either `false` or `true`. ``` ssize_t writeToFd(int fd, const void* buf, size_t len) { (...) return false; (...) return true; ``` --- subproc.cc | 3 +-- util.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/subproc.cc b/subproc.cc index 339b5bf..f10a5e4 100644 --- a/subproc.cc +++ b/subproc.cc @@ -383,8 +383,7 @@ static bool initParent(nsjconf_t* nsjconf, pid_t pid, int pipefd) { LOG_E("Couldn't initialize user namespace for pid %d", pid); return false; } - if (util::writeToFd(pipefd, &kSubprocDoneChar, sizeof(kSubprocDoneChar)) != - sizeof(kSubprocDoneChar)) { + if (!util::writeToFd(pipefd, &kSubprocDoneChar, sizeof(kSubprocDoneChar))) { LOG_E("Couldn't signal the new process via a socketpair"); return false; } diff --git a/util.cc b/util.cc index ddf39b8..e271e9d 100644 --- a/util.cc +++ b/util.cc @@ -75,7 +75,7 @@ ssize_t readFromFile(const char* fname, void* buf, size_t len) { return ret; } -ssize_t writeToFd(int fd, const void* buf, size_t len) { +bool writeToFd(int fd, const void* buf, size_t len) { const uint8_t* charbuf = (const uint8_t*)buf; size_t writtenSz = 0; -- 2.7.4