tree-wide: do not print hint about -M if -M is already used
(Or when -H is used, since -H and -M are incompatible.) Note that the slightly unusual form with separate boolean variables (hint_vars, hint_addr) instead of e.g. a const char* variable to hold the message, because this way we don't trigger the warning about non-literal format.
This commit is contained in:
+3
-3
@@ -102,7 +102,7 @@ static int acquire_bus(bool set_monitor, sd_bus **ret) {
|
||||
|
||||
if (arg_address)
|
||||
r = sd_bus_set_address(bus, arg_address);
|
||||
else {
|
||||
else
|
||||
switch (arg_transport) {
|
||||
|
||||
case BUS_TRANSPORT_LOCAL:
|
||||
@@ -123,13 +123,13 @@ static int acquire_bus(bool set_monitor, sd_bus **ret) {
|
||||
default:
|
||||
assert_not_reached();
|
||||
}
|
||||
}
|
||||
|
||||
if (r < 0)
|
||||
return bus_log_address_error(r, arg_transport);
|
||||
|
||||
r = sd_bus_start(bus);
|
||||
if (r < 0)
|
||||
return bus_log_connect_error(r);
|
||||
return bus_log_connect_error(r, arg_transport);
|
||||
|
||||
*ret = TAKE_PTR(bus);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user