mirror of
https://github.com/matrix-construct/construct
synced 2024-11-01 03:18:54 +01:00
ircd::strl: Simplify strlcat; reuse strlcpy. (related f705df096d
).
This commit is contained in:
parent
4956716431
commit
cc1028bd8f
1 changed files with 8 additions and 5 deletions
|
@ -35,6 +35,11 @@ struct ircd::strlcpy
|
||||||
mutable_buffer ret;
|
mutable_buffer ret;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
explicit operator const mutable_buffer &() const
|
||||||
|
{
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
operator string_view() const
|
operator string_view() const
|
||||||
{
|
{
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -97,16 +102,14 @@ struct ircd::strlcat
|
||||||
};
|
};
|
||||||
|
|
||||||
assert(pos <= max);
|
assert(pos <= max);
|
||||||
const auto remain
|
const mutable_buffer tgt
|
||||||
{
|
{
|
||||||
max - pos
|
dst + pos, max - pos
|
||||||
};
|
};
|
||||||
|
|
||||||
strlcpy(dst + pos, src, remain);
|
|
||||||
assert(pos + src.size() <= max);
|
|
||||||
ret = mutable_buffer
|
ret = mutable_buffer
|
||||||
{
|
{
|
||||||
dst, pos + src.size()
|
dst, end(mutable_buffer(strlcpy(tgt, src)))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue