3 files changed, 9 insertions, 10 deletions

diff --git a/src/firejail/appimage_size.c b/src/firejail/appimage_size.c
index 64fff6901..3f5c3150c 100644
--- a/src/firejail/appimage_size.c
+++ b/src/firejail/appimage_size.c
@@ -41,7 +41,6 @@ e_shoff + ( e_shentsize * e_shnum ) =		126584
 typedef Elf32_Nhdr Elf_Nhdr;
 
 static Elf64_Ehdr ehdr;
-static Elf64_Phdr *phdr;
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define ELFDATANATIVE ELFDATA2LSB
@@ -75,7 +74,7 @@ static uint64_t file64_to_cpu(uint64_t val) {
 // return 0 if error
 static long unsigned int read_elf32(int fd) {
         Elf32_Ehdr ehdr32;
-        ssize_t ret, i;
+        ssize_t ret;
 
         ret = pread(fd, &ehdr32, sizeof(ehdr32), 0);
         if (ret < 0 || (size_t)ret != sizeof(ehdr))
@@ -92,7 +91,7 @@ static long unsigned int read_elf32(int fd) {
 // return 0 if error
 static long unsigned int read_elf64(int fd) {
         Elf64_Ehdr ehdr64;
-        ssize_t ret, i;
+        ssize_t ret;
 
         ret = pread(fd, &ehdr64, sizeof(ehdr64), 0);
         if (ret < 0 || (size_t)ret != sizeof(ehdr))
diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c
index d3ef2578c..d1225c3bc 100644
--- a/src/firejail/sbox.c
+++ b/src/firejail/sbox.c
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <net/if.h>
 #include <stdarg.h>
+ #include <sys/wait.h>
 #include "../include/seccomp.h"
 
 static struct sock_filter filter[] = {
@@ -112,7 +113,7 @@ typedef struct sbox_config {
 
 int sbox_run(unsigned filter, int num, ...) {
         EUID_ROOT();
-        char *path = NULL;
+        
         int i;
         va_list valist;
         va_start(valist, num);
@@ -159,7 +160,10 @@ printf("\n");
                 else if (filter & SBOX_USER)
                         drop_privs(1);
 
-                execvp(arg[0], arg);
+                if (arg[0])     // get rid of scan-build warning
+                        execvp(arg[0], arg);
+                else
+                        assert(0);
                 perror("execl");
                 _exit(1);
         }
diff --git a/src/fnet/main.c b/src/fnet/main.c
index 88f71c4b3..f17287cb9 100644
--- a/src/fnet/main.c
+++ b/src/fnet/main.c
@@ -17,11 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/prctl.h>
-#include <linux/capability.h>
+#include "fnet.h"
 
 static void usage(void) {
         printf("Usage:\n");