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: gc half-created stub units
[elogind.git]
/
src
/
core
/
unit.c
diff --git
a/src/core/unit.c
b/src/core/unit.c
index 016b1e3d869d846b29806e1be9f758c8529f249d..1bbcb39d3227209ee1a537795112248ac947f458 100644
(file)
--- a/
src/core/unit.c
+++ b/
src/core/unit.c
@@
-259,9
+259,6
@@
int unit_set_description(Unit *u, const char *description) {
bool unit_check_gc(Unit *u) {
assert(u);
bool unit_check_gc(Unit *u) {
assert(u);
- if (u->load_state == UNIT_STUB)
- return true;
-
if (UNIT_VTABLE(u)->no_gc)
return true;
if (UNIT_VTABLE(u)->no_gc)
return true;
@@
-1140,8
+1137,6
@@
_pure_ static const char *unit_get_status_message_format_try_harder(Unit *u, Job
return NULL;
}
return NULL;
}
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static void unit_status_print_starting_stopping(Unit *u, JobType t) {
const char *format;
static void unit_status_print_starting_stopping(Unit *u, JobType t) {
const char *format;
@@
-1154,12
+1149,11
@@
static void unit_status_print_starting_stopping(Unit *u, JobType t) {
if (!format)
return;
if (!format)
return;
+ DISABLE_WARNING_FORMAT_NONLITERAL;
unit_status_printf(u, "", format);
unit_status_printf(u, "", format);
+ REENABLE_WARNING;
}
}
-#pragma GCC diagnostic pop
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
const char *format;
char buf[LINE_MAX];
static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
const char *format;
char buf[LINE_MAX];
@@
-1179,8
+1173,10
@@
static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
if (!format)
return;
if (!format)
return;
+ DISABLE_WARNING_FORMAT_NONLITERAL;
snprintf(buf, sizeof(buf), format, unit_description(u));
char_array_0(buf);
snprintf(buf, sizeof(buf), format, unit_description(u));
char_array_0(buf);
+ REENABLE_WARNING;
mid = t == JOB_START ? SD_MESSAGE_UNIT_STARTING :
t == JOB_STOP ? SD_MESSAGE_UNIT_STOPPING :
mid = t == JOB_START ? SD_MESSAGE_UNIT_STARTING :
t == JOB_STOP ? SD_MESSAGE_UNIT_STOPPING :
@@
-1192,7
+1188,6
@@
static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
"MESSAGE=%s", buf,
NULL);
}
"MESSAGE=%s", buf,
NULL);
}
-#pragma GCC diagnostic pop
/* Errors:
* -EBADR: This unit type does not support starting.
/* Errors:
* -EBADR: This unit type does not support starting.
@@
-2525,12
+2520,11
@@
int unit_coldplug(Unit *u) {
return 0;
}
return 0;
}
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
void unit_status_printf(Unit *u, const char *status, const char *unit_status_msg_format) {
void unit_status_printf(Unit *u, const char *status, const char *unit_status_msg_format) {
+ DISABLE_WARNING_FORMAT_NONLITERAL;
manager_status_printf(u->manager, false, status, unit_status_msg_format, unit_description(u));
manager_status_printf(u->manager, false, status, unit_status_msg_format, unit_description(u));
+ REENABLE_WARNING;
}
}
-#pragma GCC diagnostic pop
bool unit_need_daemon_reload(Unit *u) {
_cleanup_strv_free_ char **t = NULL;
bool unit_need_daemon_reload(Unit *u) {
_cleanup_strv_free_ char **t = NULL;