X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=79a9d549542b970157197cd50a31974baa60d918;hb=5bd4b173605142c7be493aa4d958ebaef21f421d;hp=d86fdd2a0125625c1e1bf3f59a4f3951806c262f;hpb=a626df3efd908b6d868d49207905bdd5162e5609;p=elogind.git

diff --git a/src/core/manager.c b/src/core/manager.c
index d86fdd2a0..79a9d5495 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <signal.h>
@@ -27,14 +26,10 @@
 #include <unistd.h>
 #include <sys/inotify.h>
 #include <sys/epoll.h>
-#include <sys/poll.h>
 #include <sys/reboot.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>
-#include <termios.h>
 #include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
 #include <sys/timerfd.h>
 
@@ -43,7 +38,6 @@
 #endif
 
 #include "sd-daemon.h"
-#include "sd-id128.h"
 #include "sd-messages.h"
 
 #include "manager.h"
@@ -56,7 +50,6 @@
 #include "mkdir.h"
 #include "ratelimit.h"
 #include "locale-setup.h"
-#include "mount-setup.h"
 #include "unit-name.h"
 #include "missing.h"
 #include "path-lookup.h"
@@ -64,7 +57,6 @@
 #include "exit-status.h"
 #include "virt.h"
 #include "watchdog.h"
-#include "cgroup-util.h"
 #include "path-util.h"
 #include "audit-fd.h"
 #include "boot-timestamps.h"
@@ -1725,8 +1717,8 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
                 case SIGINT:
                         if (m->running_as == SYSTEMD_SYSTEM) {
 
-                                /* If the user presses C-A-D too more
-                                 * than 7 times within 2s, we reboot
+                                /* If the user presses C-A-D more than
+                                 * 7 times within 2s, we reboot
                                  * immediately. */
 
                                 if (ratelimit_test(&m->ctrl_alt_del_ratelimit))
@@ -2106,8 +2098,7 @@ void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success) {
                 return;
         }
 
-        msg = strappenda("unit=", p);
-
+        msg = strjoina("unit=", p);
         if (audit_log_user_comm_message(audit_fd, type, msg, "systemd", NULL, NULL, NULL, success) < 0) {
                 if (errno == EPERM)
                         /* We aren't allowed to send audit messages?