final cleanup

1 files changed, 1 insertions, 17 deletions

diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index 147b5073b..6124310b1 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -33,8 +33,6 @@ static int arg_interface = 0;
 static int arg_seccomp = 0;
 static int arg_caps = 0;
 static int arg_cpu = 0;
-static int arg_cgroup = 0;
-static int arg_x11 = 0;
 static int arg_top = 0;
 static int arg_list = 0;
 static int arg_netstats = 0;
@@ -159,10 +157,6 @@ int main(int argc, char **argv) {
 
 
                 // cumulative options with or without a pid argument
-                else if (strcmp(argv[i], "--x11") == 0)
-                        arg_x11 = 1;
-                else if (strcmp(argv[i], "--cgroup") == 0)
-                        arg_cgroup = 1;
                 else if (strcmp(argv[i], "--cpu") == 0)
                         arg_cpu = 1;
                 else if (strcmp(argv[i], "--seccomp") == 0)
@@ -250,13 +244,11 @@ int main(int argc, char **argv) {
 
         // if --name requested without other options, print all data
         if (pid && !arg_cpu && !arg_seccomp && !arg_caps && !arg_apparmor &&
-            !arg_cgroup && !arg_x11 && !arg_interface && !arg_route && !arg_arp) {
+            !arg_interface && !arg_route && !arg_arp) {
                 arg_tree = 1;
                 arg_cpu = 1;
                 arg_seccomp = 1;
                 arg_caps = 1;
-                arg_cgroup = 1;
-                arg_x11 = 1;
                 arg_interface = 1;
                 arg_route = 1;
                 arg_arp = 1;
@@ -281,14 +273,6 @@ int main(int argc, char **argv) {
                 apparmor((pid_t) pid, print_procs);
                 print_procs = 0;
         }
-        if (arg_cgroup) {
-                cgroup((pid_t) pid, print_procs);
-                print_procs = 0;
-        }
-        if (arg_x11) {
-                x11((pid_t) pid, print_procs);
-                print_procs = 0;
-        }
         if (arg_interface && getuid() == 0) {
                 interface((pid_t) pid, print_procs);
                 print_procs = 0;