picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4681 from keszybz/shortening

Browse source 
Shortening
This commit is contained in:
Martin Pitt 2016-11-17 08:20:01 +01:00 committed by GitHub
parent 4a58145f0f 76d8ca2229
commit 375fd1559b
2 changed files with 24 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/core/dbus-job.c
View file

@ -258,40 +258,35 @@ static int bus_job_track_handler(sd_bus_track *t, void *userdata) {
}
static int bus_job_allocate_bus_track(Job *j) {
int r;
assert(j);
if (j->bus_track)
return 0;
r = sd_bus_track_new(j->unit->manager->api_bus, &j->bus_track, bus_job_track_handler, j);
if (r < 0)
return r;
return 0;
return sd_bus_track_new(j->unit->manager->api_bus, &j->bus_track, bus_job_track_handler, j);
}
int bus_job_coldplug_bus_track(Job *j) {
int r = 0;
_cleanup_strv_free_ char **deserialized_clients = NULL;
assert(j);
if (strv_isempty(j->deserialized_clients))
goto finish;
deserialized_clients = j->deserialized_clients;
j->deserialized_clients = NULL;
if (strv_isempty(deserialized_clients))
return 0;
if (!j->manager->api_bus)
goto finish;
return 0;
r = bus_job_allocate_bus_track(j);
if (r < 0)
goto finish;
return r;
r = bus_track_add_name_many(j->bus_track, j->deserialized_clients);
finish:
j->deserialized_clients = strv_free(j->deserialized_clients);
return r;
return bus_track_add_name_many(j->bus_track, deserialized_clients);
}
int bus_job_track_sender(Job *j, sd_bus_message *m) {

34
src/systemctl/systemctl.c
View file

@ -2197,7 +2197,7 @@ finish:
return r;
}
static void output_waiting_jobs(sd_bus *bus, uint32_t id, const char *method, const char *prefix) {
static int output_waiting_jobs(sd_bus *bus, uint32_t id, const char *method, const char *prefix) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
const char *name, *type, *state, *job_path, *unit_path;
@ -2215,29 +2215,23 @@ static void output_waiting_jobs(sd_bus *bus, uint32_t id, const char *method, co
&error,
&reply,
"u", id);
if (r < 0) {
log_debug_errno(r, "Failed to get waiting jobs for job %" PRIu32, id);
return;
}
if (r < 0)
return log_debug_errno(r, "Failed to get waiting jobs for job %" PRIu32, id);
r = sd_bus_message_enter_container(reply, 'a', "(usssoo)");
if (r < 0) {
bus_log_parse_error(r);
return;
}
if (r < 0)
return bus_log_parse_error(r);
while ((r = sd_bus_message_read(reply, "(usssoo)", &other_id, &name, &type, &state, &job_path, &unit_path)) > 0)
printf("%s%u (%s/%s)\n", prefix, other_id, name, type);
if (r < 0) {
bus_log_parse_error(r);
return;
}
printf("%s %u (%s/%s)\n", prefix, other_id, name, type);
if (r < 0)
return bus_log_parse_error(r);
r = sd_bus_message_exit_container(reply);
if (r < 0) {
bus_log_parse_error(r);
return;
}
if (r < 0)
return bus_log_parse_error(r);
return 0;
}
struct job_info {
@ -2309,9 +2303,9 @@ static void output_jobs_list(sd_bus *bus, const struct job_info* jobs, unsigned
on, state_len, j->state, off);
if (arg_jobs_after)
output_waiting_jobs(bus, j->id, "GetJobAfter", "\tA job waits for this job: ");
output_waiting_jobs(bus, j->id, "GetJobAfter", "\twaiting for job");
if (arg_jobs_before)
output_waiting_jobs(bus, j->id, "GetJobBefore", "\tThis job waits for a job: ");
output_waiting_jobs(bus, j->id, "GetJobBefore", "\tblocking job");
}
if (!arg_no_legend) {