[OpenWrt-Devel] [PATCH procd v3 6/7] jail: cleanup include

Etienne CHAMPETIER champetier.etienne at gmail.com
Wed Aug 26 19:26:46 EDT 2015


Signed-off-by: Etienne CHAMPETIER <champetier.etienne at gmail.com>
---
 jail/elf.c  | 14 --------------
 jail/jail.c | 10 ----------
 jail/log.h  |  1 +
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/jail/elf.c b/jail/elf.c
index c198599..cbb3051 100644
--- a/jail/elf.c
+++ b/jail/elf.c
@@ -12,33 +12,19 @@
  */
 
 #define _GNU_SOURCE
-#include <sys/syscall.h>
 #include <sys/mman.h>
-#include <sys/utsname.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <values.h>
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <syslog.h>
 #include <libgen.h>
 #include <glob.h>
 #include <elf.h>
 
-#include <libubox/avl.h>
-#include <libubox/avl-cmp.h>
 #include <libubox/utils.h>
-#include <libubox/list.h>
-#include <libubox/uloop.h>
 
 #include "elf.h"
 
diff --git a/jail/jail.c b/jail/jail.c
index 3d0830e..40b7558 100644
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -12,12 +12,6 @@
  */
 
 #define _GNU_SOURCE
-#include <sys/syscall.h>
-#include <sys/mman.h>
-#include <sys/utsname.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
@@ -30,16 +24,12 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <syslog.h>
 #include <libgen.h>
-#include <glob.h>
-#include <elf.h>
 #include <sched.h>
 
 #include "elf.h"
 #include "capabilities.h"
 
-#include <libubox/utils.h>
 #include <libubox/list.h>
 #include <libubox/uloop.h>
 
diff --git a/jail/log.h b/jail/log.h
index f8590b3..b1d201e 100644
--- a/jail/log.h
+++ b/jail/log.h
@@ -12,6 +12,7 @@
  */
 
 extern int debug;
+#include <syslog.h>
 
 #define INFO(fmt, ...) do { \
 	printf("jail: "fmt, ## __VA_ARGS__); \
-- 
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list