GNOME.org
 

[libgtop] Remove useless/meaningless calls to glibtop_init_[prs]() with sysdeps/{freebsd, linux}.

commit d817bee619662d235aac093b1891004b9b14b035
Author: Benoit Dejean <bdejean gmail com>
Date:   Tue Jul 21 23:42:43 2015 +0200

    Remove useless/meaningless calls to glibtop_init_[prs]() with sysdeps/{freebsd,linux}.

 sysdeps/freebsd/cpu.c         |    2 --
 sysdeps/freebsd/fsusage.c     |    2 --
 sysdeps/freebsd/loadavg.c     |    2 --
 sysdeps/freebsd/mem.c         |    2 --
 sysdeps/freebsd/mountlist.c   |    2 --
 sysdeps/freebsd/msg_limits.c  |    2 --
 sysdeps/freebsd/netlist.c     |    2 --
 sysdeps/freebsd/netload.c     |    2 --
 sysdeps/freebsd/ppp.c         |    2 --
 sysdeps/freebsd/procargs.c    |    2 --
 sysdeps/freebsd/prockernel.c  |    2 --
 sysdeps/freebsd/proclist.c    |    2 --
 sysdeps/freebsd/procmap.c     |    2 --
 sysdeps/freebsd/procmem.c     |    2 --
 sysdeps/freebsd/procsegment.c |    2 --
 sysdeps/freebsd/procsignal.c  |    2 --
 sysdeps/freebsd/procstate.c   |    2 --
 sysdeps/freebsd/proctime.c    |    2 --
 sysdeps/freebsd/procuid.c     |    2 --
 sysdeps/freebsd/sem_limits.c  |    2 --
 sysdeps/freebsd/shm_limits.c  |    2 --
 sysdeps/freebsd/swap.c        |    2 --
 sysdeps/freebsd/sysinfo.c     |    2 --
 sysdeps/freebsd/uptime.c      |    2 --
 sysdeps/linux/fsusage.c       |    1 -
 sysdeps/linux/mountlist.c     |    1 -
 26 files changed, 0 insertions(+), 50 deletions(-)
---
diff --git a/sysdeps/freebsd/cpu.c b/sysdeps/freebsd/cpu.c
index 8d6ed2e..8670f62 100644
--- a/sysdeps/freebsd/cpu.c
+++ b/sysdeps/freebsd/cpu.c
@@ -59,8 +59,6 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
        size_t length;
        int ncpu, i;
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
-
        memset (buf, 0, sizeof (glibtop_cpu));
 
        length = sizeof (cpts);
diff --git a/sysdeps/freebsd/fsusage.c b/sysdeps/freebsd/fsusage.c
index b6f87a0..0463c8c 100644
--- a/sysdeps/freebsd/fsusage.c
+++ b/sysdeps/freebsd/fsusage.c
@@ -142,8 +142,6 @@ glibtop_get_fsusage_s(glibtop *server, glibtop_fsusage *buf, const char *path)
 {
        struct statvfs fsd;
 
-       glibtop_init_r (&server, 0, 0);
-
        memset (buf, 0, sizeof (glibtop_fsusage));
 
        if (statvfs (path, &fsd) < 0)
diff --git a/sysdeps/freebsd/loadavg.c b/sysdeps/freebsd/loadavg.c
index 213444d..3436558 100644
--- a/sysdeps/freebsd/loadavg.c
+++ b/sysdeps/freebsd/loadavg.c
@@ -51,8 +51,6 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
        pid_t last_pid;
        size_t len;
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_LOADAVG, 0);
-
        memset (buf, 0, sizeof (glibtop_loadavg));
 
        if (getloadavg (buf->loadavg, G_N_ELEMENTS(buf->loadavg)) == -1)
diff --git a/sysdeps/freebsd/mem.c b/sysdeps/freebsd/mem.c
index a9e9d25..22f560e 100644
--- a/sysdeps/freebsd/mem.c
+++ b/sysdeps/freebsd/mem.c
@@ -76,8 +76,6 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
        gulong membuffer;
        gulong memfree;
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_MEM, 0);
-
        memset (buf, 0, sizeof *buf);
 
        memtotal = mem_get_by_bytes (server, "hw.physmem");
diff --git a/sysdeps/freebsd/mountlist.c b/sysdeps/freebsd/mountlist.c
index e8301b1..9956bd5 100644
--- a/sysdeps/freebsd/mountlist.c
+++ b/sysdeps/freebsd/mountlist.c
@@ -126,8 +126,6 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)
        GArray *mount_array = g_array_new(FALSE, FALSE,
                                          sizeof(glibtop_mountentry));
 
-       glibtop_init_r (&server, 0, 0);
-
        memset (buf, 0, sizeof (glibtop_mountlist));
 
        /* Read filesystem list. */
diff --git a/sysdeps/freebsd/msg_limits.c b/sysdeps/freebsd/msg_limits.c
index 020ff53..87d49b6 100644
--- a/sysdeps/freebsd/msg_limits.c
+++ b/sysdeps/freebsd/msg_limits.c
@@ -48,8 +48,6 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
        size_t len;
        int msgmax, msgmni, msgmnb, msgtql, msgssz, msgseg;
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_MSG_LIMITS, 0);
-
        memset (buf, 0, sizeof (glibtop_msg_limits));
 
        if (server->sysdeps.msg_limits == 0)
diff --git a/sysdeps/freebsd/netlist.c b/sysdeps/freebsd/netlist.c
index 59550e0..ccefffc 100644
--- a/sysdeps/freebsd/netlist.c
+++ b/sysdeps/freebsd/netlist.c
@@ -41,8 +41,6 @@ glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf)
        struct if_nameindex *ifstart, *ifs;
        GPtrArray *devices;
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_NETLIST, 0);
-
        memset (buf, 0, sizeof (glibtop_netlist));
 
        ifs = ifstart = if_nameindex();
diff --git a/sysdeps/freebsd/netload.c b/sysdeps/freebsd/netload.c
index 4a75414..a9a609e 100644
--- a/sysdeps/freebsd/netload.c
+++ b/sysdeps/freebsd/netload.c
@@ -100,8 +100,6 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
                 struct in_ifaddr in;
         } ifaddr;
 
-        glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_NETLOAD), 0);
-
         memset (buf, 0, sizeof (glibtop_netload));
 
        if (server->sysdeps.netload == 0) return;
diff --git a/sysdeps/freebsd/ppp.c b/sysdeps/freebsd/ppp.c
index fc63604..4710589 100644
--- a/sysdeps/freebsd/ppp.c
+++ b/sysdeps/freebsd/ppp.c
@@ -96,8 +96,6 @@ glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device)
 #endif
        int phase;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PPP), 0);
-
        memset (buf, 0, sizeof (glibtop_ppp));
 
        if (server->sysdeps.ppp == 0) return;
diff --git a/sysdeps/freebsd/procargs.c b/sysdeps/freebsd/procargs.c
index 8aebfbb..5188620 100644
--- a/sysdeps/freebsd/procargs.c
+++ b/sysdeps/freebsd/procargs.c
@@ -52,8 +52,6 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
        size_t size = 0, pos = 0;
        int count;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_ARGS), 0);
-
        memset (buf, 0, sizeof (glibtop_proc_args));
 
        /* swapper, init, pagedaemon, vmdaemon, update - this doen't work. */
diff --git a/sysdeps/freebsd/prockernel.c b/sysdeps/freebsd/prockernel.c
index f7c5980..fbd65ef 100644
--- a/sysdeps/freebsd/prockernel.c
+++ b/sysdeps/freebsd/prockernel.c
@@ -69,8 +69,6 @@ glibtop_get_proc_kernel_p (glibtop *server,
        struct kinfo_proc *pinfo;
        int count;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_KERNEL), 0);
-
        memset (buf, 0, sizeof (glibtop_proc_kernel));
 
        if (server->sysdeps.proc_time == 0)
diff --git a/sysdeps/freebsd/proclist.c b/sysdeps/freebsd/proclist.c
index 19fae16..80dd9fd 100644
--- a/sysdeps/freebsd/proclist.c
+++ b/sysdeps/freebsd/proclist.c
@@ -72,8 +72,6 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
        unsigned int i;
        pid_t prev;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROCLIST), 0);
-
        memset (buf, 0, sizeof (glibtop_proclist));
 
        if (sysctlbyname ("kern.proc.all", NULL, &len, NULL, 0)) {
diff --git a/sysdeps/freebsd/procmap.c b/sysdeps/freebsd/procmap.c
index 124fc4a..3464447 100644
--- a/sysdeps/freebsd/procmap.c
+++ b/sysdeps/freebsd/procmap.c
@@ -209,8 +209,6 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
         int count;
         int update = 0;
 
-        glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MAP), 0);
-
         memset (buf, 0, sizeof (glibtop_proc_map));
 
         /* It does not work for the swapper task. */
diff --git a/sysdeps/freebsd/procmem.c b/sysdeps/freebsd/procmem.c
index 8c5a071..b398c41 100644
--- a/sysdeps/freebsd/procmem.c
+++ b/sysdeps/freebsd/procmem.c
@@ -75,8 +75,6 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
        struct vm_object object;
        int count;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
-
        memset (buf, 0, sizeof (glibtop_proc_mem));
 
        if (server->sysdeps.proc_mem == 0)
diff --git a/sysdeps/freebsd/procsegment.c b/sysdeps/freebsd/procsegment.c
index 0e8aedb..4a16c5a 100644
--- a/sysdeps/freebsd/procsegment.c
+++ b/sysdeps/freebsd/procsegment.c
@@ -55,8 +55,6 @@ glibtop_get_proc_segment_p (glibtop *server,
        struct kinfo_proc *pinfo;
        int count = 0;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_SEGMENT), 0);
-
        memset (buf, 0, sizeof (glibtop_proc_segment));
 
        /* It does not work for the swapper task. */
diff --git a/sysdeps/freebsd/procsignal.c b/sysdeps/freebsd/procsignal.c
index 0320624..f8eaf4a 100644
--- a/sysdeps/freebsd/procsignal.c
+++ b/sysdeps/freebsd/procsignal.c
@@ -52,8 +52,6 @@ glibtop_get_proc_signal_p (glibtop *server,
        struct kinfo_proc *pinfo;
        int count = 0;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_SIGNAL), 0);
-
        memset (buf, 0, sizeof (glibtop_proc_signal));
 
        /* It does not work for the swapper task. */
diff --git a/sysdeps/freebsd/procstate.c b/sysdeps/freebsd/procstate.c
index d9e3e71..993bb78 100644
--- a/sysdeps/freebsd/procstate.c
+++ b/sysdeps/freebsd/procstate.c
@@ -50,8 +50,6 @@ glibtop_get_proc_state_p (glibtop *server,
        struct kinfo_proc *pinfo;
        int count = 0;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_STATE), 0);
-
        memset (buf, 0, sizeof (glibtop_proc_state));
 
        /* Get the process information */
diff --git a/sysdeps/freebsd/proctime.c b/sysdeps/freebsd/proctime.c
index ae9ab95..836d289 100644
--- a/sysdeps/freebsd/proctime.c
+++ b/sysdeps/freebsd/proctime.c
@@ -66,8 +66,6 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
        int count;
        size_t len;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);
-
        memset (buf, 0, sizeof (glibtop_proc_time));
 
        /* It does not work for the swapper task. */
diff --git a/sysdeps/freebsd/procuid.c b/sysdeps/freebsd/procuid.c
index 1f268bc..6594690 100644
--- a/sysdeps/freebsd/procuid.c
+++ b/sysdeps/freebsd/procuid.c
@@ -50,8 +50,6 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
        struct kinfo_proc *pinfo;
        int count = 0;
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_UID), 0);
-
        memset (buf, 0, sizeof (glibtop_proc_uid));
 
        /* It does not work for the swapper task. */
diff --git a/sysdeps/freebsd/sem_limits.c b/sysdeps/freebsd/sem_limits.c
index ba1bdb0..078a245 100644
--- a/sysdeps/freebsd/sem_limits.c
+++ b/sysdeps/freebsd/sem_limits.c
@@ -51,8 +51,6 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
        int semmap, semmni, semmns, semmnu, semmsl, semopm, semume, semusz;
        int semvmx, semaem;
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_SEM_LIMITS, 0);
-
        memset (buf, 0, sizeof (glibtop_sem_limits));
 
        if (server->sysdeps.sem_limits == 0)
diff --git a/sysdeps/freebsd/shm_limits.c b/sysdeps/freebsd/shm_limits.c
index 29dcc73..6704289 100644
--- a/sysdeps/freebsd/shm_limits.c
+++ b/sysdeps/freebsd/shm_limits.c
@@ -53,8 +53,6 @@ glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
        unsigned long shmmax, shmmin, shmmni, shmseg, shmall;
 #endif
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_SHM_LIMITS, 0);
-
        memset (buf, 0, sizeof (glibtop_shm_limits));
 
        if (server->sysdeps.shm_limits == 0)
diff --git a/sysdeps/freebsd/swap.c b/sysdeps/freebsd/swap.c
index c0dde77..44e833e 100644
--- a/sysdeps/freebsd/swap.c
+++ b/sysdeps/freebsd/swap.c
@@ -56,8 +56,6 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
        int nswdev;
        struct kvm_swap kvmsw[16];
 
-       glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_SWAP), 0);
-
        memset (buf, 0, sizeof (glibtop_swap));
        memset (kvmsw, 0, sizeof (kvmsw));
 
diff --git a/sysdeps/freebsd/sysinfo.c b/sysdeps/freebsd/sysinfo.c
index f0cbaff..551efbe 100644
--- a/sysdeps/freebsd/sysinfo.c
+++ b/sysdeps/freebsd/sysinfo.c
@@ -43,8 +43,6 @@ init_sysinfo (glibtop *server)
        if (G_LIKELY (sysinfo.flags))
                return;
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
-
        ncpus = server->ncpu + 1;
 
        len = 0;
diff --git a/sysdeps/freebsd/uptime.c b/sysdeps/freebsd/uptime.c
index 7a678da..68c58c8 100644
--- a/sysdeps/freebsd/uptime.c
+++ b/sysdeps/freebsd/uptime.c
@@ -58,8 +58,6 @@ glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
        size_t size;
        glibtop_cpu cpu;
 
-       glibtop_init_s (&server, GLIBTOP_SYSDEPS_UPTIME, 0);
-
        memset (buf, 0, sizeof (glibtop_uptime));
 
        mib[0] = CTL_KERN;
diff --git a/sysdeps/linux/fsusage.c b/sysdeps/linux/fsusage.c
index a7fd16c..2c5654f 100644
--- a/sysdeps/linux/fsusage.c
+++ b/sysdeps/linux/fsusage.c
@@ -194,7 +194,6 @@ glibtop_get_fsusage_s(glibtop *server, glibtop_fsusage *buf, const char *path)
 {
   struct statvfs fsd;
 
-  glibtop_init_r(&server, 0, 0);
   memset(buf, 0, sizeof(glibtop_fsusage));
 
   if (statvfs(path, &fsd) < 0) {
diff --git a/sysdeps/linux/mountlist.c b/sysdeps/linux/mountlist.c
index 1133b05..7c376fd 100644
--- a/sysdeps/linux/mountlist.c
+++ b/sysdeps/linux/mountlist.c
@@ -118,7 +118,6 @@ glibtop_get_mountlist_s(glibtop *server, glibtop_mountlist *buf, int all_fs)
   GArray* entries;
   IgnoreList* ig = NULL;
 
-  glibtop_init_r(&server, 0, 0);
   memset(buf, 0, sizeof(glibtop_mountlist));
 
   /* wild guess, preallocate 8 entries
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]