From df0ec6640959ebdef2f7a25bca822eb2d3a5a24f Mon Sep 17 00:00:00 2001 From: Michael Haas Date: Sun, 16 Aug 2015 13:35:05 +0200 Subject: Fix typo: viod -> void --- src/firejail/bandwidth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/firejail/bandwidth.c b/src/firejail/bandwidth.c index 25dd7a0fb..e0be1f06a 100644 --- a/src/firejail/bandwidth.c +++ b/src/firejail/bandwidth.c @@ -98,7 +98,7 @@ void ifbw_remove(IFBW *r) { return; } -int fibw_count(viod) { +int fibw_count(void) { int rv = 0; IFBW *ptr = ifbw; -- cgit v1.2.3-54-g00ecf From 8116a431355a07d0f6bee29acfffd15868896df8 Mon Sep 17 00:00:00 2001 From: Michael Haas Date: Sun, 16 Aug 2015 13:35:28 +0200 Subject: Remove unused variables --- src/firejail/fs_etc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c index 57b0b4f3e..3f4faa26f 100644 --- a/src/firejail/fs_etc.c +++ b/src/firejail/fs_etc.c @@ -88,8 +88,6 @@ void fs_private_etc_list(void) { char *private_list = cfg.etc_private_keep; assert(private_list); - uid_t u = getuid(); - gid_t g = getgid(); struct stat s; if (stat("/etc", &s) == -1) { fprintf(stderr, "Error: cannot find user /etc directory\n"); -- cgit v1.2.3-54-g00ecf From 212ded54a5b0606fcd95c0675da9ece75e62b9b8 Mon Sep 17 00:00:00 2001 From: Michael Haas Date: Sun, 16 Aug 2015 13:35:53 +0200 Subject: Fix comparison between unsigned and signed --- src/firejail/arp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/firejail/arp.c b/src/firejail/arp.c index 37f8716e7..fc60285b2 100644 --- a/src/firejail/arp.c +++ b/src/firejail/arp.c @@ -131,7 +131,7 @@ int arp_check(const char *dev, uint32_t destaddr, uint32_t srcaddr) { } // parse the incomming packet - if (len < 14 + sizeof(ArpHdr)) + if ((unsigned int) len < 14 + sizeof(ArpHdr)) continue; if (frame[12] != (ETH_P_ARP / 256) || frame[13] != (ETH_P_ARP % 256)) continue; @@ -331,7 +331,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) { // wait not more than one second for an answer int header_printed = 0; - int last_ip = 0; + uint32_t last_ip = 0; struct timeval ts; ts.tv_sec = 2; // 2 seconds receive timeout ts.tv_usec = 0; @@ -410,7 +410,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) { } // parse the incomming packet - if (len < 14 + sizeof(ArpHdr)) + if ((unsigned int) len < 14 + sizeof(ArpHdr)) continue; // look only at ARP packets -- cgit v1.2.3-54-g00ecf