From 2158d8d04e0d88c61b0d7de9f7abc0e54139de75 Mon Sep 17 00:00:00 2001
From: startx2017 <vradu.startx@yandex.com>
Date: Tue, 15 Aug 2017 10:11:08 -0400
Subject: compile cleanup

---
 src/firejail/fs_bin.c  | 4 ++--
 src/firejail/join.c    | 2 ++
 src/fldd/main.c        | 2 +-
 src/fseccomp/syscall.c | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index 7b259bf03..f70bd095b 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -152,8 +152,8 @@ void fs_private_bin_list(void) {
 		duplicate(ptr, fplist);
 	free(dlist);
 	fs_logger_print();
-    if (fplist)
-        fclose(fplist);
+	if (fplist)
+		fclose(fplist);
 
 	// mount-bind
 	int i = 0;
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 84bd80364..dd7b2e9bb 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -51,8 +51,10 @@ static void extract_x11_display(pid_t pid) {
 
 	if (1 != fscanf(fp, "%d", &display)) {
 		fprintf(stderr, "Error: cannot read X11 display file\n");
+		fclose(fp);
 		return;
 	}
+	fclose(fp);
 
 	// check display range
 	if (display < X11_DISPLAY_START || display > X11_DISPLAY_END) {
diff --git a/src/fldd/main.c b/src/fldd/main.c
index d9045c425..947c6b4ae 100644
--- a/src/fldd/main.c
+++ b/src/fldd/main.c
@@ -176,7 +176,7 @@ static void copy_libs_for_exe(const char *exe) {
 			if (!ptr_ok(dbuf, base, end, "dbuf"))
 				goto close;
 			// Find DT_RPATH/DT_RUNPATH tags first
-			long size = sbuf->sh_size;
+			unsigned long size = sbuf->sh_size;
 			while (size >= sizeof(*dbuf) && ptr_ok(dbuf, base, end, "dbuf")) {
 				if (dbuf->d_tag == DT_RPATH || dbuf->d_tag ==  DT_RUNPATH) {
 					const char *searchpath = strbase + dbuf->d_un.d_ptr;
diff --git a/src/fseccomp/syscall.c b/src/fseccomp/syscall.c
index b9e6d995b..3a9be51a7 100644
--- a/src/fseccomp/syscall.c
+++ b/src/fseccomp/syscall.c
@@ -511,6 +511,7 @@ int syscall_check_list(const char *slist, void (*callback)(int fd, int syscall,
 
 static void find_syscall(int fd, int syscall, int arg, void *ptrarg) {
 	(void)fd;
+	(void) arg;
 	SyscallCheckList *ptr = ptrarg;
 	if (syscall == ptr->syscall)
 		ptr->found = true;
@@ -518,6 +519,7 @@ static void find_syscall(int fd, int syscall, int arg, void *ptrarg) {
 
 // go through list2 and find matches for problem syscall
 static void syscall_in_list(int fd, int syscall, int arg, void *ptrarg) {
+	(void) fd;
 	(void)arg;
 	SyscallCheckList *ptr = ptrarg;
 	SyscallCheckList sl;
@@ -543,6 +545,7 @@ static void syscall_in_list(int fd, int syscall, int arg, void *ptrarg) {
 
 // go through list and find matches for syscalls in list @default-keep
 void syscalls_in_list(const char *list, const char *slist, int fd, char **prelist, char **postlist) {
+	(void) fd;
 	SyscallCheckList sl;
 	// these syscalls are used by firejail after the seccomp filter is initialized
 	sl.slist = slist;
-- 
cgit v1.2.3-54-g00ecf