Merge pull request #20138 from keszybz/coding-style-variable-decls

A coding style tweak and checking of sd_notify() calls and voidification of pager_open()

diff --cc src/analyze/analyze.c
index f3b103a5bc3d4a72970d56f6f2fc1059d9fc0211,5badbd8ca831e172f2b959239eac0037d47eb171..82fdd3deeeacfe6227628af8603cae4b2e5a4fbf
--- 1/src/analyze/analyze.c
--- 2/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@@ -1347,9 -1347,9 +1347,9 @@@ static int dump(int argc, char *argv[]
  
          r = acquire_bus(&bus, NULL);
          if (r < 0)
 -                return bus_log_connect_error(r);
 +                return bus_log_connect_error(r, arg_transport);
  
-         (void) pager_open(arg_pager_flags);
+         pager_open(arg_pager_flags);
  
          if (!sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD))
                  return dump_fallback(bus);
@@@ -2268,9 -2268,9 +2268,9 @@@ static int do_security(int argc, char *
  
          r = acquire_bus(&bus, NULL);
          if (r < 0)
 -                return bus_log_connect_error(r);
 +                return bus_log_connect_error(r, arg_transport);
  
-         (void) pager_open(arg_pager_flags);
+         pager_open(arg_pager_flags);
  
          if (arg_security_policy) {
                  r = json_parse_file(/*f=*/ NULL, arg_security_policy, /*flags=*/ 0, &policy, &line, &column);

diff --cc src/boot/bootctl.c
Simple merge

diff --cc src/busctl/busctl.c
Simple merge

diff --cc src/cgls/cgls.c
Simple merge

diff --cc src/home/homectl.c
Simple merge

diff --cc src/locale/localectl.c
Simple merge

diff --cc src/login/inhibit.c
Simple merge

diff --cc src/login/loginctl.c
Simple merge

diff --cc src/machine/machinectl.c
Simple merge

diff --cc src/mount/mount-tool.c
Simple merge

diff --cc src/nspawn/nspawn.c
Simple merge

diff --cc src/portable/portablectl.c
Simple merge

diff --cc src/shared/pager.c
Simple merge

diff --cc src/timedate/timedatectl.c
Simple merge