diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-15 20:25:10 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-15 20:25:10 +0200 |
| commit | b5af2aca120f1bf13cffc270803c2232918dd967 (patch) | |
| tree | 69b8c2fcb5584ce2ef6970e03da5af55c7647eeb /src/core/job.c | |
| parent | def9a7aa0182e5ecca3ac61b26f75136a5c4f103 (diff) | |
| parent | b39a2770ba55637da80e2e389222c59dbea73507 (diff) | |
Merge commit 'b39a2770ba55637da80e2e389222c59dbea73507'
Diffstat (limited to 'src/core/job.c')
| -rw-r--r-- | src/core/job.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/job.c b/src/core/job.c index dc4f44150c..5e4987f4e2 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -90,8 +90,8 @@ void job_free(Job *j) { sd_event_source_unref(j->timer_event_source); - sd_bus_track_unref(j->subscribed); - strv_free(j->deserialized_subscribed); + sd_bus_track_unref(j->clients); + strv_free(j->deserialized_clients); free(j); } @@ -937,7 +937,7 @@ int job_serialize(Job *j, FILE *f, FDSet *fds) { if (j->begin_usec > 0) fprintf(f, "job-begin="USEC_FMT"\n", j->begin_usec); - bus_track_serialize(j->subscribed, f); + bus_track_serialize(j->clients, f); /* End marker */ fputc('\n', f); @@ -1043,7 +1043,7 @@ int job_deserialize(Job *j, FILE *f, FDSet *fds) { } else if (streq(l, "subscribed")) { - if (strv_extend(&j->deserialized_subscribed, v) < 0) + if (strv_extend(&j->deserialized_clients, v) < 0) return log_oom(); } } @@ -1056,7 +1056,7 @@ int job_coldplug(Job *j) { /* After deserialization is complete and the bus connection * set up again, let's start watching our subscribers again */ - r = bus_track_coldplug(j->manager, &j->subscribed, &j->deserialized_subscribed); + r = bus_track_coldplug(j->manager, &j->clients, &j->deserialized_clients); if (r < 0) return r; |