mirror of
https://codeberg.org/dnkl/foot.git
synced 2026-02-04 04:06:06 -05:00
terminal: simplify some string-related code in reload_fonts()
This commit is contained in:
parent
8073ad352b
commit
6ed1c28d2c
3 changed files with 20 additions and 30 deletions
12
xmalloc.h
12
xmalloc.h
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <wchar.h>
|
||||
#include <uchar.h>
|
||||
|
||||
|
|
@ -16,3 +17,14 @@ char *xstrndup(const char *str, size_t n) XSTRDUP;
|
|||
char *xasprintf(const char *format, ...) PRINTF(1) XMALLOC;
|
||||
char *xvasprintf(const char *format, va_list va) VPRINTF(1) XMALLOC;
|
||||
char32_t *xc32dup(const char32_t *str) XSTRDUP;
|
||||
|
||||
static inline char *
|
||||
xstrjoin(const char *s1, const char *s2)
|
||||
{
|
||||
size_t n1 = strlen(s1);
|
||||
size_t n2 = strlen(s2);
|
||||
char *joined = xmalloc(n1 + n2 + 1);
|
||||
memcpy(joined, s1, n1);
|
||||
memcpy(joined + n1, s2, n2 + 1);
|
||||
return joined;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue