chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible lack of status messages on shutdown/reboot
[elogind.git]
/
src
/
core
/
job.h
diff --git
a/src/core/job.h
b/src/core/job.h
index 45d04874516dd0aa54d94c54620cd563fc0e1b1f..be9d278b0c9fdc551b799a2386aa805b053bd986 100644
(file)
--- a/
src/core/job.h
+++ b/
src/core/job.h
@@
-183,22
+183,22
@@
void job_dependency_free(JobDependency *l);
int job_merge(Job *j, Job *other);
int job_merge(Job *j, Job *other);
-JobType job_type_lookup_merge(JobType a, JobType b);
+JobType job_type_lookup_merge(JobType a, JobType b)
_pure_
;
-static inline bool job_type_is_mergeable(JobType a, JobType b) {
+
_pure_
static inline bool job_type_is_mergeable(JobType a, JobType b) {
return job_type_lookup_merge(a, b) >= 0;
}
return job_type_lookup_merge(a, b) >= 0;
}
-static inline bool job_type_is_conflicting(JobType a, JobType b) {
+
_pure_
static inline bool job_type_is_conflicting(JobType a, JobType b) {
return !job_type_is_mergeable(a, b);
}
return !job_type_is_mergeable(a, b);
}
-static inline bool job_type_is_superset(JobType a, JobType b) {
+
_pure_
static inline bool job_type_is_superset(JobType a, JobType b) {
/* Checks whether operation a is a "superset" of b in its actions */
return a == job_type_lookup_merge(a, b);
}
/* Checks whether operation a is a "superset" of b in its actions */
return a == job_type_lookup_merge(a, b);
}
-bool job_type_is_redundant(JobType a, UnitActiveState b);
+bool job_type_is_redundant(JobType a, UnitActiveState b)
_pure_
;
/* Collapses a state-dependent job type into a simpler type by observing
* the state of the unit which it is going to be applied to. */
/* Collapses a state-dependent job type into a simpler type by observing
* the state of the unit which it is going to be applied to. */
@@
-206,8
+206,6
@@
void job_type_collapse(JobType *t, Unit *u);
int job_type_merge_and_collapse(JobType *a, JobType b, Unit *u);
int job_type_merge_and_collapse(JobType *a, JobType b, Unit *u);
-bool job_is_runnable(Job *j);
-
void job_add_to_run_queue(Job *j);
void job_add_to_dbus_queue(Job *j);
void job_add_to_run_queue(Job *j);
void job_add_to_dbus_queue(Job *j);
@@
-221,14
+219,14
@@
char *job_dbus_path(Job *j);
void job_shutdown_magic(Job *j);
void job_shutdown_magic(Job *j);
-const char* job_type_to_string(JobType t);
-JobType job_type_from_string(const char *s);
+const char* job_type_to_string(JobType t)
_const_
;
+JobType job_type_from_string(const char *s)
_pure_
;
-const char* job_state_to_string(JobState t);
-JobState job_state_from_string(const char *s);
+const char* job_state_to_string(JobState t)
_const_
;
+JobState job_state_from_string(const char *s)
_pure_
;
-const char* job_mode_to_string(JobMode t);
-JobMode job_mode_from_string(const char *s);
+const char* job_mode_to_string(JobMode t)
_const_
;
+JobMode job_mode_from_string(const char *s)
_pure_
;
-const char* job_result_to_string(JobResult t);
-JobResult job_result_from_string(const char *s);
+const char* job_result_to_string(JobResult t)
_const_
;
+JobResult job_result_from_string(const char *s)
_pure_
;