MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-28 14:58:20 +02:00
Code Issues Releases Wiki Activity

ircd: Eliminate lambda frame from strl suite ctors.

Browse source
This commit is contained in:
Jason Volk 2022-06-29 12:14:48 -07:00
parent 1327823d2c
commit f705df096d
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
include/ircd/strl.h
View file

@ -46,19 +46,17 @@ struct ircd::strlcpy
} }
strlcpy(char *const &dst, const string_view &src, const size_t &max) strlcpy(char *const &dst, const string_view &src, const size_t &max)
:ret{[&]() -> mutable_buffer noexcept
{ {
mutable_buffer buf{dst, max}; mutable_buffer buf{dst, max};
const mutable_buffer tgt ret = mutable_buffer
{ {
buf, std::min(size(src), std::max(max, 1UL) - 1UL) buf, std::min(size(src), std::max(max, 1UL) - 1UL)
}; };
consume(buf, copy(tgt, src)); consume(buf, copy(ret, src));
consume(buf, copy(buf, '\0')); consume(buf, copy(buf, '\0'));
return tgt; }
}()}
{}
#ifndef HAVE_STRLCPY #ifndef HAVE_STRLCPY
strlcpy(char *const &dst, const char *const &src, const size_t &max) strlcpy(char *const &dst, const char *const &src, const size_t &max)
@ -91,18 +89,30 @@ struct ircd::strlcat
} }
strlcat(char *const &dst, const string_view &src, const size_t &max) strlcat(char *const &dst, const string_view &src, const size_t &max)
:ret{[&]() -> mutable_buffer noexcept
{ {
const auto pos{strnlen(dst, max)}; const auto pos
const auto remain{max - pos}; {
strnlen(dst, max)
};
assert(pos <= max);
const auto remain
{
max - pos
};
strlcpy(dst + pos, src, remain); strlcpy(dst + pos, src, remain);
return { dst, pos + src.size() }; assert(pos + src.size() <= max);
}()} ret = mutable_buffer
{} {
dst, pos + src.size()
};
}
#ifndef HAVE_STRLCAT #ifndef HAVE_STRLCAT
strlcat(char *const &dst, const char *const &src, const size_t &max) strlcat(char *const &dst, const char *const &src, const size_t &max)
:strlcat{dst, string_view{src, ::strnlen(src, max)}, max} :strlcat{dst, string_view{src, strnlen(src, max)}, max}
{} {}
#endif #endif