mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
dbus-wait-for-jobs: add extra_args to bus_wait_for_jobs_one()
And pass it through to bus_wait_for_jobs()
This commit is contained in:
parent
b3bfe6b9e1
commit
86980de64b
@ -601,7 +601,7 @@ static int start_transient_mount(
|
||||
if (r < 0)
|
||||
return bus_log_parse_error(r);
|
||||
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet);
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
@ -710,7 +710,7 @@ static int start_transient_automount(
|
||||
if (r < 0)
|
||||
return bus_log_parse_error(r);
|
||||
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet);
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
@ -875,7 +875,7 @@ static int stop_mount(
|
||||
if (r < 0)
|
||||
return bus_log_parse_error(r);
|
||||
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet);
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
@ -313,7 +313,7 @@ int allocate_scope(
|
||||
if (r < 0)
|
||||
return bus_log_parse_error(r);
|
||||
|
||||
r = bus_wait_for_jobs_one(w, object, false);
|
||||
r = bus_wait_for_jobs_one(w, object, false, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
@ -1229,7 +1229,7 @@ static int start_transient_service(
|
||||
if (r < 0)
|
||||
return bus_log_parse_error(r);
|
||||
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet);
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
@ -1465,7 +1465,7 @@ static int start_transient_scope(sd_bus *bus) {
|
||||
if (r < 0)
|
||||
return bus_log_parse_error(r);
|
||||
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet);
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -1685,7 +1685,7 @@ static int start_transient_trigger(
|
||||
if (r < 0)
|
||||
return bus_log_parse_error(r);
|
||||
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet);
|
||||
r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
@ -323,12 +323,12 @@ int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path) {
|
||||
return set_put_strdup(&d->jobs, path);
|
||||
}
|
||||
|
||||
int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet) {
|
||||
int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet, const char* const* extra_args) {
|
||||
int r;
|
||||
|
||||
r = bus_wait_for_jobs_add(d, path);
|
||||
if (r < 0)
|
||||
return log_oom();
|
||||
|
||||
return bus_wait_for_jobs(d, quiet, NULL);
|
||||
return bus_wait_for_jobs(d, quiet, extra_args);
|
||||
}
|
||||
|
@ -11,6 +11,6 @@ int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret);
|
||||
BusWaitForJobs* bus_wait_for_jobs_free(BusWaitForJobs *d);
|
||||
int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path);
|
||||
int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet, const char* const* extra_args);
|
||||
int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet);
|
||||
int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet, const char* const* extra_args);
|
||||
|
||||
DEFINE_TRIVIAL_CLEANUP_FUNC(BusWaitForJobs*, bus_wait_for_jobs_free);
|
||||
|
@ -247,7 +247,7 @@ static int allocate_scope(void) {
|
||||
if (r < 0)
|
||||
return bus_log_parse_error(r);
|
||||
|
||||
r = bus_wait_for_jobs_one(w, object, false);
|
||||
r = bus_wait_for_jobs_one(w, object, false, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user