chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Rename Job.subscribed field to Job.clients
[elogind.git]
/
src
/
core
/
job.c
diff --git
a/src/core/job.c
b/src/core/job.c
index dc4f44150c3c6fbc091092762ad36ef74ac07436..5e4987f4e2b289b4f1296a25a718066e0d9a76b4 100644
(file)
--- 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_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);
}
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);
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);
/* End marker */
fputc('\n', f);
@@
-1043,7
+1043,7
@@
int job_deserialize(Job *j, FILE *f, FDSet *fds) {
} else if (streq(l, "subscribed")) {
} else if (streq(l, "subscribed")) {
- if (strv_extend(&j->deserialized_
subscribed
, v) < 0)
+ if (strv_extend(&j->deserialized_
clients
, v) < 0)
return log_oom();
}
}
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 */
/* 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;
if (r < 0)
return r;