aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/pid.c
diff options
context:
space:
mode:
authorLibravatar Peter Millerchip <pete@millerchipsoftware.com>2015-08-20 14:38:44 +0100
committerLibravatar Peter Millerchip <pete@millerchipsoftware.com>2015-08-20 14:38:44 +0100
commit48af0110f88d63bc351579974ceafde352ebe8e2 (patch)
tree806b45a3c1ab0c7e676b5168ee84f2dfd743bd8f /src/lib/pid.c
parentMerge pull request #34 from pmillerchip/make-install (diff)
downloadfirejail-48af0110f88d63bc351579974ceafde352ebe8e2.tar.gz
firejail-48af0110f88d63bc351579974ceafde352ebe8e2.tar.zst
firejail-48af0110f88d63bc351579974ceafde352ebe8e2.zip
Compile with -W -Wall -Werror
Diffstat (limited to 'src/lib/pid.c')
-rw-r--r--src/lib/pid.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/lib/pid.c b/src/lib/pid.c
index a0261ead2..1a1797ce2 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -222,15 +222,18 @@ static void print_elem(unsigned index, int nowrap) {
222// recursivity!!! 222// recursivity!!!
223void pid_print_tree(unsigned index, unsigned parent, int nowrap) { 223void pid_print_tree(unsigned index, unsigned parent, int nowrap) {
224 print_elem(index, nowrap); 224 print_elem(index, nowrap);
225
226 // Remove unused parameter warning
227 (void)parent;
225 228
226 int i; 229 unsigned i;
227 for (i = index + 1; i < max_pids; i++) { 230 for (i = index + 1; i < (unsigned)max_pids; i++) {
228 if (pids[i].parent == index) 231 if (pids[i].parent == (pid_t)index)
229 pid_print_tree(i, index, nowrap); 232 pid_print_tree(i, index, nowrap);
230 } 233 }
231 234
232 for (i = 0; i < index; i++) { 235 for (i = 0; i < index; i++) {
233 if (pids[i].parent == index) 236 if (pids[i].parent == (pid_t)index)
234 pid_print_tree(i, index, nowrap); 237 pid_print_tree(i, index, nowrap);
235 } 238 }
236} 239}
@@ -245,6 +248,9 @@ void pid_store_cpu(unsigned index, unsigned parent, unsigned *utime, unsigned *s
245 *utime = 0; 248 *utime = 0;
246 *stime = 0; 249 *stime = 0;
247 } 250 }
251
252 // Remove unused parameter warning
253 (void)parent;
248 254
249 unsigned utmp = 0; 255 unsigned utmp = 0;
250 unsigned stmp = 0; 256 unsigned stmp = 0;
@@ -252,9 +258,9 @@ void pid_store_cpu(unsigned index, unsigned parent, unsigned *utime, unsigned *s
252 *utime += utmp; 258 *utime += utmp;
253 *stime += stmp; 259 *stime += stmp;
254 260
255 int i; 261 unsigned i;
256 for (i = index + 1; i < max_pids; i++) { 262 for (i = index + 1; i < (unsigned)max_pids; i++) {
257 if (pids[i].parent == index) 263 if (pids[i].parent == (pid_t)index)
258 pid_store_cpu(i, index, utime, stime); 264 pid_store_cpu(i, index, utime, stime);
259 } 265 }
260 266