diff options
Diffstat (limited to 'src/firemon/firemon.c')
-rw-r--r-- | src/firemon/firemon.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c index 91406d6a7..4ee319a7e 100644 --- a/src/firemon/firemon.c +++ b/src/firemon/firemon.c | |||
@@ -34,7 +34,6 @@ static int arg_interface = 0; | |||
34 | static int arg_seccomp = 0; | 34 | static int arg_seccomp = 0; |
35 | static int arg_caps = 0; | 35 | static int arg_caps = 0; |
36 | static int arg_cpu = 0; | 36 | static int arg_cpu = 0; |
37 | static int arg_cgroup = 0; | ||
38 | static int arg_x11 = 0; | 37 | static int arg_x11 = 0; |
39 | static int arg_top = 0; | 38 | static int arg_top = 0; |
40 | static int arg_list = 0; | 39 | static int arg_list = 0; |
@@ -173,8 +172,6 @@ int main(int argc, char **argv) { | |||
173 | // cumulative options with or without a pid argument | 172 | // cumulative options with or without a pid argument |
174 | else if (strcmp(argv[i], "--x11") == 0) | 173 | else if (strcmp(argv[i], "--x11") == 0) |
175 | arg_x11 = 1; | 174 | arg_x11 = 1; |
176 | else if (strcmp(argv[i], "--cgroup") == 0) | ||
177 | arg_cgroup = 1; | ||
178 | else if (strcmp(argv[i], "--cpu") == 0) | 175 | else if (strcmp(argv[i], "--cpu") == 0) |
179 | arg_cpu = 1; | 176 | arg_cpu = 1; |
180 | else if (strcmp(argv[i], "--seccomp") == 0) | 177 | else if (strcmp(argv[i], "--seccomp") == 0) |
@@ -264,12 +261,11 @@ int main(int argc, char **argv) { | |||
264 | 261 | ||
265 | // if --name requested without other options, print all data | 262 | // if --name requested without other options, print all data |
266 | if (pid && !arg_cpu && !arg_seccomp && !arg_caps && !arg_apparmor && | 263 | if (pid && !arg_cpu && !arg_seccomp && !arg_caps && !arg_apparmor && |
267 | !arg_cgroup && !arg_x11 && !arg_interface && !arg_route && !arg_arp) { | 264 | !arg_x11 && !arg_interface && !arg_route && !arg_arp) { |
268 | arg_tree = 1; | 265 | arg_tree = 1; |
269 | arg_cpu = 1; | 266 | arg_cpu = 1; |
270 | arg_seccomp = 1; | 267 | arg_seccomp = 1; |
271 | arg_caps = 1; | 268 | arg_caps = 1; |
272 | arg_cgroup = 1; | ||
273 | arg_x11 = 1; | 269 | arg_x11 = 1; |
274 | arg_interface = 1; | 270 | arg_interface = 1; |
275 | arg_route = 1; | 271 | arg_route = 1; |
@@ -295,10 +291,6 @@ int main(int argc, char **argv) { | |||
295 | apparmor((pid_t) pid, print_procs); | 291 | apparmor((pid_t) pid, print_procs); |
296 | print_procs = 0; | 292 | print_procs = 0; |
297 | } | 293 | } |
298 | if (arg_cgroup) { | ||
299 | cgroup((pid_t) pid, print_procs); | ||
300 | print_procs = 0; | ||
301 | } | ||
302 | if (arg_x11) { | 294 | if (arg_x11) { |
303 | x11((pid_t) pid, print_procs); | 295 | x11((pid_t) pid, print_procs); |
304 | print_procs = 0; | 296 | print_procs = 0; |