diff --git a/ircd/json.cc b/ircd/json.cc index 831bcfdc5..29ee3c271 100644 --- a/ircd/json.cc +++ b/ircd/json.cc @@ -324,17 +324,14 @@ ircd::string_view ircd::json::stringify(mutable_buffer &head, const iov &iov) { - const auto num{iov.size()}; - const member *m[num]; - - size_t i(0); - std::for_each(std::begin(iov), std::end(iov), [&i, &m] - (const auto &member) + const member *m[iov.size()]; + std::transform(std::begin(iov), std::end(iov), m, [] + (const member &m) { - m[i++] = &member; + return &m; }); - return stringify(head, m, m + num); + return stringify(head, m, m + iov.size()); } size_t diff --git a/ircd/lexical.cc b/ircd/lexical.cc index 812d5e749..d147d9de9 100644 --- a/ircd/lexical.cc +++ b/ircd/lexical.cc @@ -726,7 +726,7 @@ ircd::b64decode(const mutable_raw_buffer &out, std::distance(begin(out), e) }; - assert(len <= size(out)); + assert(size_t(len) <= size(out)); return { data(out), size_t(len) }; } diff --git a/ircd/net.cc b/ircd/net.cc index 66f8edf64..7dacbecc0 100644 --- a/ircd/net.cc +++ b/ircd/net.cc @@ -836,7 +836,7 @@ noexcept try } catch(const std::exception &e) { - log::error("socket(%p): async handler: unhandled user exception: %s", + log::error("socket(%p): async handler: unhandled exception: %s", this, e.what());