diff --git a/src/libipc/platform/posix/condition.h b/src/libipc/platform/posix/condition.h index 3500322..ea66a96 100644 --- a/src/libipc/platform/posix/condition.h +++ b/src/libipc/platform/posix/condition.h @@ -23,7 +23,7 @@ class condition { pthread_cond_t *acquire_cond(char const *name) { LIBIPC_LOG(); if (!shm_.acquire(name, sizeof(pthread_cond_t))) { - log.error("[acquire_cond] fail shm.acquire: %s", name); + log.error("[acquire_cond] fail shm.acquire: ", name); return nullptr; } return static_cast(shm_.get()); @@ -62,17 +62,17 @@ public: int eno; pthread_condattr_t cond_attr; if ((eno = ::pthread_condattr_init(&cond_attr)) != 0) { - log.error("fail pthread_condattr_init[%d]", eno); + log.error("fail pthread_condattr_init[", eno, "]"); return false; } LIBIPC_UNUSED auto guard_cond_attr = guard([&cond_attr] { ::pthread_condattr_destroy(&cond_attr); }); if ((eno = ::pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED)) != 0) { - log.error("fail pthread_condattr_setpshared[%d]", eno); + log.error("fail pthread_condattr_setpshared[", eno, "]"); return false; } *cond_ = PTHREAD_COND_INITIALIZER; if ((eno = ::pthread_cond_init(cond_, &cond_attr)) != 0) { - log.error("fail pthread_cond_init[%d]", eno); + log.error("fail pthread_cond_init[", eno, "]"); return false; } finally.dismiss(); @@ -84,7 +84,7 @@ public: if ((shm_.ref() <= 1) && cond_ != nullptr) { int eno; if ((eno = ::pthread_cond_destroy(cond_)) != 0) { - log.error("fail pthread_cond_destroy[%d]", eno); + log.error("fail pthread_cond_destroy[", eno, "]"); } } shm_.release(); @@ -95,7 +95,7 @@ public: if ((shm_.ref() <= 1) && cond_ != nullptr) { int eno; if ((eno = ::pthread_cond_destroy(cond_)) != 0) { - log.error("fail pthread_cond_destroy[%d]", eno); + log.error("fail pthread_cond_destroy[", eno, "]"); } } shm_.clear(); // Make sure the storage is cleaned up. @@ -113,7 +113,7 @@ public: case invalid_value: { int eno; if ((eno = ::pthread_cond_wait(cond_, static_cast(mtx.native()))) != 0) { - log.error("fail pthread_cond_wait[%d]", eno); + log.error("fail pthread_cond_wait[", eno, "]"); return false; } } @@ -137,7 +137,7 @@ public: if (!valid()) return false; int eno; if ((eno = ::pthread_cond_signal(cond_)) != 0) { - log.error("fail pthread_cond_signal[%d]", eno); + log.error("fail pthread_cond_signal[", eno, "]"); return false; } return true; @@ -147,7 +147,7 @@ public: if (!valid()) return false; int eno; if ((eno = ::pthread_cond_broadcast(cond_)) != 0) { - log.error("fail pthread_cond_broadcast[%d]", eno); + log.error("fail pthread_cond_broadcast[", eno, "]"); return false; } return true; diff --git a/src/libipc/platform/posix/semaphore_impl.h b/src/libipc/platform/posix/semaphore_impl.h index 9d52cbe..d9d4213 100644 --- a/src/libipc/platform/posix/semaphore_impl.h +++ b/src/libipc/platform/posix/semaphore_impl.h @@ -37,7 +37,7 @@ public: LIBIPC_LOG(); close(); if (!shm_.acquire(name, 1)) { - log.error("[open_semaphore] fail shm.acquire: ", name, ""); + log.error("[open_semaphore] fail shm.acquire: ", name); return false; } // POSIX semaphore names must start with "/" on some platforms (e.g., FreeBSD) @@ -49,7 +49,7 @@ public: } h_ = ::sem_open(sem_name_.c_str(), O_CREAT, 0666, static_cast(count)); if (h_ == SEM_FAILED) { - log.error("fail sem_open[%d]: ", errno, sem_name_.c_str(, "")); + log.error("fail sem_open[", errno, "]: ", sem_name_); return false; } return true; @@ -59,13 +59,13 @@ public: LIBIPC_LOG(); if (!valid()) return; if (::sem_close(h_) != 0) { - log.error("fail sem_close[%d]: ", errno, ""); + log.error("fail sem_close[", errno, "]"); } h_ = SEM_FAILED; if (!sem_name_.empty() && shm_.name() != nullptr) { if (shm_.release() <= 1) { if (::sem_unlink(sem_name_.c_str()) != 0) { - log.error("fail sem_unlink[%d]: ", errno, sem_name_.c_str(, ", name: %s")); + log.error("fail sem_unlink[", errno, "]: ", sem_name_); } } } @@ -76,7 +76,7 @@ public: LIBIPC_LOG(); if (valid()) { if (::sem_close(h_) != 0) { - log.error("fail sem_close[%d]: ", errno, ""); + log.error("fail sem_close[", errno, "]"); } h_ = SEM_FAILED; } @@ -104,7 +104,7 @@ public: if (!valid()) return false; if (tm == invalid_value) { if (::sem_wait(h_) != 0) { - log.error("fail sem_wait[%d]: ", errno, ""); + log.error("fail sem_wait[", errno, "]"); return false; } } else { @@ -124,7 +124,7 @@ public: if (!valid()) return false; for (std::uint32_t i = 0; i < count; ++i) { if (::sem_post(h_) != 0) { - log.error("fail sem_post[%d]: ", errno, ""); + log.error("fail sem_post[", errno, "]"); return false; } } diff --git a/src/libipc/platform/win/mutex.h b/src/libipc/platform/win/mutex.h index 3eb536d..1989d95 100644 --- a/src/libipc/platform/win/mutex.h +++ b/src/libipc/platform/win/mutex.h @@ -40,7 +40,7 @@ public: close(); h_ = ::CreateMutex(detail::get_sa(), FALSE, detail::to_tchar(name).c_str()); if (h_ == NULL) { - log.error("fail CreateMutex[%lu]: ", ::GetLastError(, ""), name); + log.error("fail CreateMutex[", static_cast(::GetLastError()), "]: ", name); return false; } return true; diff --git a/src/libipc/platform/win/semaphore.h b/src/libipc/platform/win/semaphore.h index 1be0b56..2182d91 100644 --- a/src/libipc/platform/win/semaphore.h +++ b/src/libipc/platform/win/semaphore.h @@ -39,7 +39,7 @@ public: static_cast(count), LONG_MAX, detail::to_tchar(name).c_str()); if (h_ == NULL) { - log.error("fail CreateSemaphore[%lu]: ", ::GetLastError(, ""), name); + log.error("fail CreateSemaphore[", static_cast(::GetLastError()), "]: ", name); return false; } return true;