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>
This commit is contained in:
Joachim Nilsson committed 2017-02-10 10:20:29 +01:00
1 parent d56031db7d
commit bbbaba7b47
2 files changed
+4 -5

No files matched your search

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