diff options
author | netblue30 <netblue30@yahoo.com> | 2015-08-16 07:39:34 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2015-08-16 07:39:34 -0400 |
commit | 6e6865806fe8061a2333a25de1f1560fa3dabf45 (patch) | |
tree | 657b29ef10c14634c64eac6917f59153ff500179 | |
parent | Merge pull request #27 from mhaas/fix-typos-in-man (diff) | |
parent | Fix comparison between unsigned and signed (diff) | |
download | firejail-6e6865806fe8061a2333a25de1f1560fa3dabf45.tar.gz firejail-6e6865806fe8061a2333a25de1f1560fa3dabf45.tar.zst firejail-6e6865806fe8061a2333a25de1f1560fa3dabf45.zip |
Merge pull request #28 from mhaas/fix-some-compiler-warnings
Fix some compiler warnings
-rw-r--r-- | src/firejail/arp.c | 6 | ||||
-rw-r--r-- | src/firejail/bandwidth.c | 2 | ||||
-rw-r--r-- | src/firejail/fs_etc.c | 2 |
3 files changed, 4 insertions, 6 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) { | |||
131 | } | 131 | } |
132 | 132 | ||
133 | // parse the incomming packet | 133 | // parse the incomming packet |
134 | if (len < 14 + sizeof(ArpHdr)) | 134 | if ((unsigned int) len < 14 + sizeof(ArpHdr)) |
135 | continue; | 135 | continue; |
136 | if (frame[12] != (ETH_P_ARP / 256) || frame[13] != (ETH_P_ARP % 256)) | 136 | if (frame[12] != (ETH_P_ARP / 256) || frame[13] != (ETH_P_ARP % 256)) |
137 | continue; | 137 | continue; |
@@ -331,7 +331,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) { | |||
331 | 331 | ||
332 | // wait not more than one second for an answer | 332 | // wait not more than one second for an answer |
333 | int header_printed = 0; | 333 | int header_printed = 0; |
334 | int last_ip = 0; | 334 | uint32_t last_ip = 0; |
335 | struct timeval ts; | 335 | struct timeval ts; |
336 | ts.tv_sec = 2; // 2 seconds receive timeout | 336 | ts.tv_sec = 2; // 2 seconds receive timeout |
337 | ts.tv_usec = 0; | 337 | ts.tv_usec = 0; |
@@ -410,7 +410,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) { | |||
410 | } | 410 | } |
411 | 411 | ||
412 | // parse the incomming packet | 412 | // parse the incomming packet |
413 | if (len < 14 + sizeof(ArpHdr)) | 413 | if ((unsigned int) len < 14 + sizeof(ArpHdr)) |
414 | continue; | 414 | continue; |
415 | 415 | ||
416 | // look only at ARP packets | 416 | // look only at ARP packets |
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) { | |||
98 | return; | 98 | return; |
99 | } | 99 | } |
100 | 100 | ||
101 | int fibw_count(viod) { | 101 | int fibw_count(void) { |
102 | int rv = 0; | 102 | int rv = 0; |
103 | IFBW *ptr = ifbw; | 103 | IFBW *ptr = ifbw; |
104 | 104 | ||
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) { | |||
88 | char *private_list = cfg.etc_private_keep; | 88 | char *private_list = cfg.etc_private_keep; |
89 | assert(private_list); | 89 | assert(private_list); |
90 | 90 | ||
91 | uid_t u = getuid(); | ||
92 | gid_t g = getgid(); | ||
93 | struct stat s; | 91 | struct stat s; |
94 | if (stat("/etc", &s) == -1) { | 92 | if (stat("/etc", &s) == -1) { |
95 | fprintf(stderr, "Error: cannot find user /etc directory\n"); | 93 | fprintf(stderr, "Error: cannot find user /etc directory\n"); |