aboutsummaryrefslogtreecommitdiffstats
path: root/src/util/Alloc.hxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-10-24 19:43:48 +0200
committerMax Kellermann <max@duempel.org>2014-10-25 01:24:10 +0200
commit1178f2c1abc2d4f9962ee5cfc1d900acdf2fdb58 (patch)
tree3593963a9bb550ace4b484e32bbf0d13db0fd8d7 /src/util/Alloc.hxx
parent76f277eeb471285aa6893480599512952e12d385 (diff)
downloadmpd-1178f2c1abc2d4f9962ee5cfc1d900acdf2fdb58.tar.gz
mpd-1178f2c1abc2d4f9962ee5cfc1d900acdf2fdb58.tar.xz
mpd-1178f2c1abc2d4f9962ee5cfc1d900acdf2fdb58.zip
Util/Alloc: add xstrcatdup(), replacing g_strconcat()
Diffstat (limited to 'src/util/Alloc.hxx')
-rw-r--r--src/util/Alloc.hxx19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/util/Alloc.hxx b/src/util/Alloc.hxx
index 15c123b7a..654b7d0fe 100644
--- a/src/util/Alloc.hxx
+++ b/src/util/Alloc.hxx
@@ -64,4 +64,23 @@ gcc_malloc gcc_nonnull_all
char *
xstrndup(const char *s, size_t n);
+/**
+ * Concatenate two strings, returning a new allocation. Use free() to
+ * free it.
+ *
+ * This function never fails; in out-of-memory situations, it aborts
+ * the process.
+ */
+gcc_malloc gcc_nonnull_all
+char *
+xstrcatdup(const char *a, const char *b);
+
+gcc_malloc gcc_nonnull_all
+char *
+xstrcatdup(const char *a, const char *b, const char *c);
+
+gcc_malloc gcc_nonnull_all
+char *
+xstrcatdup(const char *a, const char *b, const char *c, const char *d);
+
#endif