X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-namespace.c;h=2397db5fffe40afaa1afe142763c72b90101b0b5;hb=e0952d9d021234e79f3a70f33a9e5d201872a417;hp=5b76b9e73ffddaaafe2f3a4f9dc6a4db885a838b;hpb=6b46ea73e3b1d8a1e65f58ac04772821bd4a72fb;p=elogind.git diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index 5b76b9e73..2397db5ff 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -19,7 +19,6 @@ along with systemd; If not, see . ***/ -#include #include #include "namespace.h" @@ -43,8 +42,8 @@ static void test_tmpdir(const char *id, const char *A, const char *B) { assert_se((x.st_mode & 01777) == 0700); assert_se((y.st_mode & 01777) == 0700); - c = strappenda(a, "/tmp"); - d = strappenda(b, "/tmp"); + c = strjoina(a, "/tmp"); + d = strjoina(b, "/tmp"); assert_se(stat(c, &x) >= 0); assert_se(stat(d, &y) >= 0); @@ -63,7 +62,7 @@ static void test_tmpdir(const char *id, const char *A, const char *B) { } static void test_netns(void) { - _cleanup_close_pipe_ int s[2] = { -1, -1 }; + _cleanup_close_pair_ int s[2] = { -1, -1 }; pid_t pid1, pid2, pid3; int r, n = 0; siginfo_t si;