aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar startx2017 <vradu.startx@yandex.com>2018-01-15 08:36:48 -0500
committerLibravatar startx2017 <vradu.startx@yandex.com>2018-01-15 08:36:48 -0500
commite51d2d4d567ca0aa36bf526f294cc967ec9b3aa9 (patch)
treed999c0a5f18dd60554bfafbbf41526de1e7d7cfa
parentMerge branch 'master' of https://github.com/netblue30/firejail (diff)
downloadfirejail-e51d2d4d567ca0aa36bf526f294cc967ec9b3aa9.tar.gz
firejail-e51d2d4d567ca0aa36bf526f294cc967ec9b3aa9.tar.zst
firejail-e51d2d4d567ca0aa36bf526f294cc967ec9b3aa9.zip
compile cleanup
-rw-r--r--src/firejail/fs_dev.c2
-rw-r--r--src/fsec-optimize/main.c2
-rw-r--r--src/fsec-optimize/optimizer.c2
-rw-r--r--src/fsec-print/print.c1
4 files changed, 3 insertions, 4 deletions
diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index 15eda6ea1..1039b151b 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -319,7 +319,7 @@ static void disable_file_or_dir(const char *fname) {
319} 319}
320 320
321void fs_dev_disable_sound(void) { 321void fs_dev_disable_sound(void) {
322 int i = 0; 322 unsigned i = 0;
323 while (dev[i].dev_fname != NULL) { 323 while (dev[i].dev_fname != NULL) {
324 if (dev[i].type == DEV_SOUND) 324 if (dev[i].type == DEV_SOUND)
325 disable_file_or_dir(dev[i].dev_fname); 325 disable_file_or_dir(dev[i].dev_fname);
diff --git a/src/fsec-optimize/main.c b/src/fsec-optimize/main.c
index d78d80c67..f4300f350 100644
--- a/src/fsec-optimize/main.c
+++ b/src/fsec-optimize/main.c
@@ -78,7 +78,7 @@ printf("\n");
78 return 1; 78 return 1;
79 } 79 }
80 size = write(fd, outfilter, entries * sizeof(struct sock_filter)); 80 size = write(fd, outfilter, entries * sizeof(struct sock_filter));
81 if (size != entries * sizeof(struct sock_filter)) { 81 if (size != (int) (entries * sizeof(struct sock_filter))) {
82 fprintf(stderr, "Error: cannot write output file\n"); 82 fprintf(stderr, "Error: cannot write output file\n");
83 return 1; 83 return 1;
84 } 84 }
diff --git a/src/fsec-optimize/optimizer.c b/src/fsec-optimize/optimizer.c
index f5bef33e2..98e4aaa34 100644
--- a/src/fsec-optimize/optimizer.c
+++ b/src/fsec-optimize/optimizer.c
@@ -91,7 +91,7 @@ static int optimize_blacklists(struct sock_filter *filter, int entries) {
91 91
92 // step 3: add the new ret KILL, and recalculate entries 92 // step 3: add the new ret KILL, and recalculate entries
93 filter_step2[j].code = BPF_RET + BPF_K; 93 filter_step2[j].code = BPF_RET + BPF_K;
94 filter_step2[j].k == SECCOMP_RET_KILL; 94 filter_step2[j].k = SECCOMP_RET_KILL;
95 entries = j + 1; 95 entries = j + 1;
96 96
97 // step 4: recalculate jumps 97 // step 4: recalculate jumps
diff --git a/src/fsec-print/print.c b/src/fsec-print/print.c
index 794172a8f..e3b53c44c 100644
--- a/src/fsec-print/print.c
+++ b/src/fsec-print/print.c
@@ -305,7 +305,6 @@ static void bpf_decode_args(const struct sock_filter *bpf, unsigned int line) {
305} 305}
306 306
307void print(struct sock_filter *filter, int entries) { 307void print(struct sock_filter *filter, int entries) {
308 unsigned int line = 0;
309 int i; 308 int i;
310 309
311 /* header */ 310 /* header */