chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make socket_instantiate_service use cleanup gcc attribute
[elogind.git]
/
src
/
core
/
job.c
diff --git
a/src/core/job.c
b/src/core/job.c
index 557917a70b0dce3e42ce08ac594acfc91376fdd5..7faa8da0ed7cf1bb13a738172574f3fc718c8230 100644
(file)
--- a/
src/core/job.c
+++ b/
src/core/job.c
@@
-508,7
+508,7
@@
int job_run_and_invalidate(Job *j) {
else if (t == UNIT_ACTIVATING)
r = -EAGAIN;
else
else if (t == UNIT_ACTIVATING)
r = -EAGAIN;
else
- r = -E
NOEXEC
;
+ r = -E
BADR
;
break;
}
break;
}
@@
-537,8
+537,10
@@
int job_run_and_invalidate(Job *j) {
if (j) {
if (r == -EALREADY)
r = job_finish_and_invalidate(j, JOB_DONE, true);
if (j) {
if (r == -EALREADY)
r = job_finish_and_invalidate(j, JOB_DONE, true);
- else if (r == -E
NOEXEC
)
+ else if (r == -E
BADR
)
r = job_finish_and_invalidate(j, JOB_SKIPPED, true);
r = job_finish_and_invalidate(j, JOB_SKIPPED, true);
+ else if (r == -ENOEXEC)
+ r = job_finish_and_invalidate(j, JOB_INVALID, true);
else if (r == -EAGAIN) {
j->state = JOB_WAITING;
m->n_running_jobs--;
else if (r == -EAGAIN) {
j->state = JOB_WAITING;
m->n_running_jobs--;
@@
-608,6
+610,8
@@
_pure_ static const char *job_get_status_message_format_try_harder(Unit *u, JobT
return NULL;
}
return NULL;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static void job_print_status_message(Unit *u, JobType t, JobResult result) {
const char *format;
static void job_print_status_message(Unit *u, JobType t, JobResult result) {
const char *format;
@@
-674,6
+678,7
@@
static void job_print_status_message(Unit *u, JobType t, JobResult result) {
unit_status_printf(u, ANSI_HIGHLIGHT_ON " INFO " ANSI_HIGHLIGHT_OFF, "%s is not active.");
}
}
unit_status_printf(u, ANSI_HIGHLIGHT_ON " INFO " ANSI_HIGHLIGHT_OFF, "%s is not active.");
}
}
+#pragma GCC diagnostic pop
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
@@
-764,7
+769,7
@@
int job_finish_and_invalidate(Job *j, JobResult result, bool recursive) {
goto finish;
}
goto finish;
}
- if (result == JOB_FAILED)
+ if (result == JOB_FAILED
|| result == JOB_INVALID
)
j->manager->n_failed_jobs ++;
job_uninstall(j);
j->manager->n_failed_jobs ++;
job_uninstall(j);
@@
-901,7
+906,7
@@
char *job_dbus_path(Job *j) {
assert(j);
assert(j);
- if (asprintf(&p, "/org/freedesktop/systemd1/job/%
lu", (unsigned long)
j->id) < 0)
+ if (asprintf(&p, "/org/freedesktop/systemd1/job/%
"PRIu32,
j->id) < 0)
return NULL;
return p;
return NULL;
return p;
@@
-917,7
+922,7
@@
int job_serialize(Job *j, FILE *f, FDSet *fds) {
fprintf(f, "job-ignore-order=%s\n", yes_no(j->ignore_order));
if (j->begin_usec > 0)
fprintf(f, "job-ignore-order=%s\n", yes_no(j->ignore_order));
if (j->begin_usec > 0)
- fprintf(f, "job-begin=
%llu\n", (unsigned long long)
j->begin_usec);
+ fprintf(f, "job-begin=
"USEC_FMT"\n",
j->begin_usec);
bus_client_track_serialize(j->manager, f, j->subscribed);
bus_client_track_serialize(j->manager, f, j->subscribed);
@@
-1119,7
+1124,8
@@
static const char* const job_result_table[_JOB_RESULT_MAX] = {
[JOB_TIMEOUT] = "timeout",
[JOB_FAILED] = "failed",
[JOB_DEPENDENCY] = "dependency",
[JOB_TIMEOUT] = "timeout",
[JOB_FAILED] = "failed",
[JOB_DEPENDENCY] = "dependency",
- [JOB_SKIPPED] = "skipped"
+ [JOB_SKIPPED] = "skipped",
+ [JOB_INVALID] = "invalid",
};
DEFINE_STRING_TABLE_LOOKUP(job_result, JobResult);
};
DEFINE_STRING_TABLE_LOOKUP(job_result, JobResult);