From e7b6317b3f31e1bc89ac2cbee08dc49a6af497fe Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Wed, 11 Oct 2017 08:41:51 -0400
Subject: --build fixes and compile cleanup

---
 src/fbuilder/build_fs.c      | 2 +-
 src/fbuilder/build_profile.c | 4 ++--
 src/firejail/fs_lib.c        | 1 -
 src/firejail/main.c          | 1 +
 src/fldd/main.c              | 1 +
 src/libtrace/libtrace.c      | 2 ++
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index dcd86e069..6f3907770 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -260,7 +260,7 @@ static void dev_callback(char *ptr) {
 void build_dev(const char *fname) {
 	assert(fname);
 	
-	process_files(fname, "/tmp", tmp_callback);
+	process_files(fname, "/dev", dev_callback);
 	
 	if (dev_out == NULL)
 		printf("private-dev\n");
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c
index 0f71fe7ad..fbe48cd4b 100644
--- a/src/fbuilder/build_profile.c
+++ b/src/fbuilder/build_profile.c
@@ -72,14 +72,14 @@ void build_profile(int argc, char **argv, int index) {
 		have_strace = 1;
 	
 	// calculate command length
-	int len = (int) sizeof(cmdlist) / sizeof(char*) + argc - index + 1;
+	unsigned len = (int) sizeof(cmdlist) / sizeof(char*) + argc - index + 1;
 	if (arg_debug)
 		printf("command len %d + %d + 1\n", (int) (sizeof(cmdlist) / sizeof(char*)), argc - index);
 	char *cmd[len];
 	cmd[0] = cmdlist[0];	// explicit assignemnt to clean scan-build error
 	
 	// build command
-	int i = 0;
+	unsigned i = 0;
 	for (i = 0; i < (int) sizeof(cmdlist) / sizeof(char*); i++) {
 		// skip strace if not installed
 		if (have_strace == 0 && strcmp(cmdlist[i], "/usr/bin/strace") == 0)
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 6826f906c..2cb32fe69 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -320,7 +320,6 @@ void fs_private_lib(void) {
 					char *name;
 					if (asprintf(&name, "/usr/lib/%s", ptr) == -1)
 						errExit("asprintf");
-					struct stat s;
 					if (is_dir(name)) {
 						fslib_copy_dir(name);
 						fslib_copy_libs(name);
diff --git a/src/firejail/main.c b/src/firejail/main.c
index e83bc899f..c9edcec29 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -851,6 +851,7 @@ static int check_arg(int argc, char **argv, const char *argument) {
 
 static void run_builder(int argc, char **argv) {
 	EUID_ASSERT();
+	(void) argc;
 
 	// drop privileges
 	if (setgid(getgid()) < 0)
diff --git a/src/fldd/main.c b/src/fldd/main.c
index 0d8292a76..8e5b2bcb5 100644
--- a/src/fldd/main.c
+++ b/src/fldd/main.c
@@ -101,6 +101,7 @@ static void storage_print(Storage *ptr, int fd) {
 
 static bool ptr_ok(const void *ptr, const void *base, const void *end, const char *name) {
 	bool r;
+	(void) name;
 
 	r = (ptr >= base && ptr < end);
 	return r;
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c
index 04cf64997..7bdf6c948 100644
--- a/src/libtrace/libtrace.c
+++ b/src/libtrace/libtrace.c
@@ -678,6 +678,8 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid) {
 // it can be used to build things like private-bin
 __attribute__((constructor))
 static void log_exec(int argc, char** argv) {
+	(void) argc;
+	(void) argv;
 	static char buf[PATH_MAX + 1];
 	int rv = readlink("/proc/self/exe", buf, PATH_MAX);
 	if (rv != -1) {
-- 
cgit v1.2.3-70-g09d2