From bbbaba7b47dc4f27a669f2b97100e2f2c3cdef36 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Fri, 10 Feb 2017 10:20:29 +0100
Subject: [PATCH] Minor cleanup

initctl: Replace daemon-only API from user tool
utmp-api.c: Remove not needed header

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 src/initctl.c  | 8 ++++----
 src/utmp-api.c | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/initctl.c b/src/initctl.c
index abfdbd1c..d3739b8c 100644
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -22,25 +22,25 @@
  */
 
 #include <err.h>
+#include <ftw.h>
 #include <ctype.h>
 #include <getopt.h>
 #include <glob.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdio.h>
+#include <time.h>
+#include <utmp.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <lite/lite.h>
-#include <ftw.h>
 
 #include "config.h"
 #include "finit.h"
 #include "cond.h"
-#include "helpers.h"
 #include "service.h"
 #include "util.h"
-#include "utmp-api.h"
 
 #define _PATH_COND _PATH_VARRUN "finit/cond/"
 
@@ -295,7 +295,7 @@ static int do_cond_dump(char *UNUSED(arg))
 	printf("===============================================================================\n");	
 
 	if (nftw(_PATH_COND, dump_one_cond, 20, 0) == -1) {
-		_e("Failed parse %s", _PATH_COND);
+		warnx("Failed parsing %s", _PATH_COND);
 		return 1;
 	}
 
diff --git a/src/utmp-api.c b/src/utmp-api.c
index 9b285124..6bdb37ad 100644
--- a/src/utmp-api.c
+++ b/src/utmp-api.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <paths.h>
-#include <stdio.h>
 #include <time.h>
 #include <utmp.h>
 #include <arpa/inet.h>