From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Fri, 5 Nov 2021 13:57:30 +0000 (+0000)
Subject: Merge pull request #20138 from keszybz/coding-style-variable-decls
X-Git-Tag: v250-rc1~353
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8389fd19d20370077f2d5601af0a089ec92ece05;p=thirdparty%2Fsystemd.git

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()
---

8389fd19d20370077f2d5601af0a089ec92ece05
diff --cc src/analyze/analyze.c
index f3b103a5bc3,5badbd8ca83..82fdd3deeea
--- a/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);