commit ad24ccd47201e885e838ac5d579d2443032b997e Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 27 10:11:27 2018 -0400

Minimize includes from sandbox.c --- src/lib/sandbox/.may_include | 4 ++++ src/lib/sandbox/sandbox.c | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/lib/sandbox/.may_include b/src/lib/sandbox/.may_include index 5c22b0e50..84906dfb3 100644 --- a/src/lib/sandbox/.may_include +++ b/src/lib/sandbox/.may_include @@ -4,7 +4,11 @@ lib/cc/*.h lib/container/*.h lib/err/*.h lib/log/*.h +lib/malloc/*.h +lib/net/*.h lib/sandbox/*.h +lib/sandbox/*.inc +lib/string/*.h

ht.h siphash.h diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index f6f445df0..e49cbd863 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -31,6 +31,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <errno.h>

#include "lib/sandbox/sandbox.h" #include "lib/container/map.h" @@ -38,11 +39,11 @@ #include "lib/log/torlog.h" #include "lib/cc/torint.h" #include "lib/net/resolve.h" -#include "common/util.h" -#include "tor_queue.h" +#include "lib/malloc/util_malloc.h" +#include "lib/string/scanf.h"

+#include "tor_queue.h" #include "ht.h" - #include "siphash.h"

#define DEBUGGING_CLOSE @@ -1558,7 +1559,8 @@ install_syscall_filter(sandbox_cfg_t* cfg) return (rc < 0 ? -rc : rc); }

-#include "linux_syscalls.inc" +#include "lib/sandbox/linux_syscalls.inc" + static const char * get_syscall_name(int syscall_num) {