chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: when printing status updates during boot, take terminal width into account
[elogind.git]
/
src
/
unit.c
diff --git
a/src/unit.c
b/src/unit.c
index 03c90f5874908335b448f398e04b6d5e79339403..dea8f4a7faa6b2e9144c9bdde8a20c1a3f2ea1d8 100644
(file)
--- a/
src/unit.c
+++ b/
src/unit.c
@@
-2441,9
+2441,6
@@
int unit_coldplug(Unit *u) {
void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
va_list ap;
void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
va_list ap;
- char *s, *e;
- int err;
- const unsigned emax = status ? 80 - (sizeof("[ OK ]")-1) : 80;
assert(u);
assert(format);
assert(u);
assert(format);
@@
-2458,21
+2455,8
@@
void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
return;
va_start(ap, format);
return;
va_start(ap, format);
-
err = vasprintf(&
s, format, ap);
+
status_vprintf(statu
s, format, ap);
va_end(ap);
va_end(ap);
- if (err < 0)
- return;
-
- e = ellipsize(s, emax, 100);
- free(s);
- if (!e)
- return;
-
- if (status)
- status_printf("%s%*s[%s]\n", e, emax - strlen(e), "", status);
- else
- status_printf("%s\n", e);
- free(e);
}
bool unit_need_daemon_reload(Unit *u) {
}
bool unit_need_daemon_reload(Unit *u) {