chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: rename sd_bus_send_with_reply_and_block() to sd_bus_call()
[elogind.git]
/
src
/
systemctl
/
systemctl.c
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index c5166d568b1c750109d7de4eca5343516f32152a..8b6dae27b844876fd09db4cf39225e0393b0aad0 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-678,7
+678,7
@@
static int list_sockets(sd_bus *bus, char **args) {
struct socket_info *s;
unsigned cs = 0;
size_t size = 0;
struct socket_info *s;
unsigned cs = 0;
size_t size = 0;
- int r, n;
+ int r
= 0
, n;
pager_open_if_enabled();
pager_open_if_enabled();
@@
-891,8
+891,9
@@
static int list_timers(sd_bus *bus, char **args) {
struct timer_info *t;
const UnitInfo *u;
size_t size = 0;
struct timer_info *t;
const UnitInfo *u;
size_t size = 0;
- int n,
r,
c = 0;
+ int n, c = 0;
dual_timestamp nw;
dual_timestamp nw;
+ int r = 0;
pager_open_if_enabled();
pager_open_if_enabled();
@@
-3844,7
+3845,7
@@
static int set_property(sd_bus *bus, char **args) {
if (r < 0)
return bus_log_create_error(r);
if (r < 0)
return bus_log_create_error(r);
- r = sd_bus_
send_with_reply_and_block(bus, m, -1
, &error, NULL);
+ r = sd_bus_
call(bus, m, 0
, &error, NULL);
if (r < 0) {
log_error("Failed to set unit properties on %s: %s", n, bus_error_message(&error, r));
return r;
if (r < 0) {
log_error("Failed to set unit properties on %s: %s", n, bus_error_message(&error, r));
return r;
@@
-4131,7
+4132,7
@@
static int set_environment(sd_bus *bus, char **args) {
if (r < 0)
return bus_log_create_error(r);
if (r < 0)
return bus_log_create_error(r);
- r = sd_bus_
send_with_reply_and_block(bus, m, -1
, &error, NULL);
+ r = sd_bus_
call(bus, m, 0
, &error, NULL);
if (r < 0) {
log_error("Failed to set environment: %s", bus_error_message(&error, r));
return r;
if (r < 0) {
log_error("Failed to set environment: %s", bus_error_message(&error, r));
return r;
@@
-4442,7
+4443,7
@@
static int enable_unit(sd_bus *bus, char **args) {
return bus_log_create_error(r);
}
return bus_log_create_error(r);
}
- r = sd_bus_
send_with_reply_and_block(bus, m, -
0, &error, &reply);
+ r = sd_bus_
call(bus, m,
0, &error, &reply);
if (r < 0) {
log_error("Failed to execute operation: %s", bus_error_message(&error, r));
return r;
if (r < 0) {
log_error("Failed to execute operation: %s", bus_error_message(&error, r));
return r;