]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-load-fragment: don't print NULLs 23654/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 7 Jun 2022 10:22:29 +0000 (12:22 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 9 Jun 2022 05:53:06 +0000 (07:53 +0200)
src/test/test-load-fragment.c

index 9cbf22312f9716d232cbfb05236db486f0681d9b..cc6301e9dca31c54b1a35cc1585751fafea10b0e 100644 (file)
@@ -70,10 +70,10 @@ static void check_execcommand(ExecCommand *c,
 
         assert_se(c);
         log_info("expect: \"%s\" [\"%s\" \"%s\" \"%s\"]",
-                 path, argv0 ?: path, argv1, argv2);
+                 path, argv0 ?: path, strnull(argv1), strnull(argv2));
         n = strv_length(c->argv);
         log_info("actual: \"%s\" [\"%s\" \"%s\" \"%s\"]",
-                 c->path, c->argv[0], n > 0 ? c->argv[1] : NULL, n > 1 ? c->argv[2] : NULL);
+                 c->path, c->argv[0], n > 0 ? c->argv[1] : "(null)", n > 1 ? c->argv[2] : "(null)");
         assert_se(streq(c->path, path));
         assert_se(streq(c->argv[0], argv0 ?: path));
         if (n > 0)