X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-conf-files.c;h=894c7f742ffb8d3ffc6d17425b86ba673f6b8d70;hb=b6e676ce41508e2aeea22202fc8f234126177f52;hp=e801c5989ef11407b42a07577f5fd1a70cd948c3;hpb=09e00c524fd4d21a3508c27d01d265b8a6c9ae30;p=elogind.git

diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index e801c5989..894c7f742 100644
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -36,7 +36,7 @@ static void setup_test_dir(char *tmp_dir, const char *files, ...) {
         va_start(ap, files);
         while (files != NULL) {
                 _cleanup_free_ char *path = strappend(tmp_dir, files);
-                assert_se(touch_file(path, true, (usec_t) -1, (uid_t) -1, (gid_t) -1, 0) == 0);
+                assert_se(touch_file(path, true, USEC_INFINITY, UID_INVALID, GID_INVALID, 0) == 0);
                 files = va_arg(ap, const char *);
         }
         va_end(ap);
@@ -59,12 +59,12 @@ static void test_conf_files_list(bool use_root) {
                 search_2 = "/dir2";
         } else {
                 root_dir = NULL;
-                search_1 = strappenda(tmp_dir, "/dir1");
-                search_2 = strappenda(tmp_dir, "/dir2");
+                search_1 = strjoina(tmp_dir, "/dir1");
+                search_2 = strjoina(tmp_dir, "/dir2");
         }
 
-        expect_a = strappenda(tmp_dir, "/dir1/a.conf");
-        expect_b = strappenda(tmp_dir, "/dir2/b.conf");
+        expect_a = strjoina(tmp_dir, "/dir1/a.conf");
+        expect_b = strjoina(tmp_dir, "/dir2/b.conf");
 
         assert_se(conf_files_list(&found_files, ".conf", root_dir, search_1, search_2, NULL) == 0);
         strv_print(found_files);