From: David Tardon Date: Wed, 24 May 2023 06:29:22 +0000 (+0200) Subject: login: use NULL to denote arg-less method call X-Git-Tag: v254-rc1~397^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ce68c7c515dac60723942d4494affd9dcdd3f3f;p=thirdparty%2Fsystemd.git login: use NULL to denote arg-less method call "" and NULL are equivalent, but the latter is normally used. --- diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 9d0d97c22cc..75dba8c08f5 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -61,7 +61,7 @@ static int print_inhibitors(sd_bus *bus) { pager_open(arg_pager_flags); - r = bus_call_method(bus, bus_login_mgr, "ListInhibitors", &error, &reply, ""); + r = bus_call_method(bus, bus_login_mgr, "ListInhibitors", &error, &reply, NULL); if (r < 0) return log_error_errno(r, "Could not get active inhibitors: %s", bus_error_message(&error, r)); diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c index b2a5dfecc82..f59cca8fed7 100644 --- a/src/login/test-inhibit.c +++ b/src/login/test-inhibit.c @@ -35,7 +35,7 @@ static void print_inhibitors(sd_bus *bus) { unsigned n = 0; int r; - r = bus_call_method(bus, bus_login_mgr, "ListInhibitors", &error, &reply, ""); + r = bus_call_method(bus, bus_login_mgr, "ListInhibitors", &error, &reply, NULL); assert_se(r >= 0); r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssuu)"); diff --git a/src/login/test-session-properties.c b/src/login/test-session-properties.c index 48aa21abef2..b5b5f60eaaa 100644 --- a/src/login/test-session-properties.c +++ b/src/login/test-session-properties.c @@ -57,7 +57,7 @@ TEST(set_type) { /* Type is reset to the original value when we release control of the session */ assert_se(!streq(type, "tty")); - assert_se(bus_call_method(bus, &session, "ReleaseControl", NULL, NULL, "") >= 0); + assert_se(bus_call_method(bus, &session, "ReleaseControl", NULL, NULL, NULL) >= 0); type = mfree(type); assert_se(bus_get_property_string(bus, &session, "Type", NULL, &type) >= 0); assert_se(streq(type, "tty"));