libgtop-GNOME-2-0-branch moved to HEAD.

2003-10-19 Carlos Perelló Marín <carlos@gnome.org> * libgtop-GNOME-2-0-branch moved to HEAD.
2003-10-19 16:10:39 +00:00
parent 5e28a55218
commit bae16b467f
148 changed files with 29273 additions and 26459 deletions
--- a/sysdeps/names/Makefile.am
+++ b/sysdeps/names/Makefile.am
@@ -2,15 +2,15 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@

 INCLUDES			= @INCLUDES@

-lib_LTLIBRARIES			= libgtop_names.la
+lib_LTLIBRARIES			= libgtop_names-2.0.la

-libgtop_names_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
+libgtop_names_2_0_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
 				  shm_limits.c msg_limits.c sem_limits.c \
 				  proclist.c sysdeps.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c \
-				  prockernel.c procsegment.c proccwd.c fsusage.c \
-				  mountlist.c procargs.c procmap.c netinfo.c \
-				  netload.c interfaces.c ppp.c
+				  prockernel.c procsegment.c fsusage.c \
+				  mountlist.c procargs.c procmap.c netload.c \
+				  ppp.c

-libgtop_names_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_names_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)

--- a/sysdeps/names/cpu.c
+++ b/sysdeps/names/cpu.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,53 +19,51 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/cpu.h>

-const char *glibtop_names_cpu[GLIBTOP_MAX_CPU] =
+const char *glibtop_names_cpu [GLIBTOP_MAX_CPU] =
 {
-    "total", "user", "nice", "sys", "idle", "frequency",
-    "xcpu_total", "xcpu_user", "xcpu_nice", "xcpu_sys",
-    "xcpu_idle", "xcpu_flags"
+	"total", "user", "nice", "sys", "idle", "frequency",
+	"xcpu_total", "xcpu_user", "xcpu_nice", "xcpu_sys",
+	"xcpu_idle"
 };

-const unsigned glibtop_types_cpu[GLIBTOP_MAX_CPU] =
-{
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+const unsigned glibtop_types_cpu [GLIBTOP_MAX_CPU] =
+{ 
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_cpu[GLIBTOP_MAX_CPU] =
+const char *glibtop_labels_cpu [GLIBTOP_MAX_CPU] =
 {
-    N_ ("Total CPU Time"),
-    N_ ("CPU Time in User Mode"),
-    N_ ("CPU Time in User Mode (nice)"),
-    N_ ("CPU Time in System Mode"),
-    N_ ("CPU Time in the Idle Task"),
-    N_ ("Tick Frequency"),
-    N_ ("SMP Total CPU Time"),
-    N_ ("SMP CPU Time in User Mode"),
-    N_ ("SMP CPU Time in User Mode (nice)"),
-    N_ ("SMP CPU Time in System Mode"),
-    N_ ("SMP CPU Time in the Idle Task"),
-    N_ ("SMP CPU Flags")
+	N_("Total CPU Time"),
+	N_("CPU Time in User Mode"),
+	N_("CPU Time in User Mode (nice)"),
+	N_("CPU Time in System Mode"),
+	N_("CPU Time in the Idle Task"),
+	N_("Tick Frequency"),
+	N_("SMP Total CPU Time"),
+	N_("SMP CPU Time in User Mode"),
+	N_("SMP CPU Time in User Mode (nice)"),
+	N_("SMP CPU Time in System Mode"),
+	N_("SMP CPU Time in the Idle Task")
 };

-const char *glibtop_descriptions_cpu[GLIBTOP_MAX_CPU] =
+const char *glibtop_descriptions_cpu [GLIBTOP_MAX_CPU] =
 {
-    N_ ("Number of clock ticks since system boot"),
-    N_ ("Number of clock ticks the system spent in user mode"),
-    N_ ("Number of clock ticks the system spent in user mode (nice)"),
-    N_ ("Number of clock ticks the system spent in system mode"),
-    N_ ("Number of clock ticks the system spent in the idle task"),
-    N_ ("Tick frequency (default is 100)"),
-    N_ ("Number of clock ticks since system boot"),
-    N_ ("Number of clock ticks the system spent in user mode"),
-    N_ ("Number of clock ticks the system spent in user mode (nice)"),
-    N_ ("Number of clock ticks the system spent in system mode"),
-    N_ ("Number of clock ticks the system spent in the idle task"),
-    N_ ("SMP CPU Flags")
+	N_("Number of clock ticks since system boot"),
+	N_("Number of clock ticks the system spent in user mode"),
+	N_("Number of clock ticks the system spent in user mode (nice)"),
+	N_("Number of clock ticks the system spent in system mode"),
+	N_("Number of clock ticks the system spent in the idle task"),
+	N_("Tick frequency (default is 100)"),
+	N_("Number of clock ticks since system boot"),
+	N_("Number of clock ticks the system spent in user mode"),
+	N_("Number of clock ticks the system spent in user mode (nice)"),
+	N_("Number of clock ticks the system spent in system mode"),
+	N_("Number of clock ticks the system spent in the idle task"),
 };
--- a/sysdeps/names/fsusage.c
+++ b/sysdeps/names/fsusage.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,35 +19,35 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/fsusage.h>

-const char *glibtop_names_fsusage[GLIBTOP_MAX_FSUSAGE] =
+const char *glibtop_names_fsusage [GLIBTOP_MAX_FSUSAGE] =
 {
-    "blocks", "bfree", "bavail", "files", "ffree"
+	"blocks", "bfree", "bavail", "files", "ffree"
 };

-const unsigned glibtop_types_fsusage[GLIBTOP_MAX_FSUSAGE] =
-{
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+const unsigned glibtop_types_fsusage [GLIBTOP_MAX_FSUSAGE] =
+{ 
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_fsusage[GLIBTOP_MAX_FSUSAGE] =
+const char *glibtop_labels_fsusage [GLIBTOP_MAX_FSUSAGE] =
 {
-    N_ ("Total blocks"),
-    N_ ("Free blocks"),
-    N_ ("Available blocks"),
-    N_ ("Total file nodes"),
-    N_ ("Free file nodes")
+	N_("Total blocks"),
+	N_("Free blocks"),
+	N_("Available blocks"),
+	N_("Total file nodes"),
+	N_("Free file nodes")
 };

-const char *glibtop_descriptions_fsusage[GLIBTOP_MAX_FSUSAGE] =
+const char *glibtop_descriptions_fsusage [GLIBTOP_MAX_FSUSAGE] =
 {
-    N_ ("Total blocks"),
-    N_ ("Free blocks available to the superuser"),
-    N_ ("Free blocks available to non-superusers"),
-    N_ ("Total file nodes"),
-    N_ ("Free file nodes")
+	N_("Total blocks"),
+	N_("Free blocks available to the superuser"),
+	N_("Free blocks available to non-superusers"),
+	N_("Total file nodes"),
+	N_("Free file nodes")
 };
--- a/sysdeps/names/loadavg.c
+++ b/sysdeps/names/loadavg.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,33 +19,33 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/loadavg.h>

-const char *glibtop_names_loadavg[GLIBTOP_MAX_LOADAVG] =
+const char *glibtop_names_loadavg [GLIBTOP_MAX_LOADAVG] =
 {
-    "loadavg", "nr_running", "nr_tasks", "last_pid"
+	"loadavg", "nr_running", "nr_tasks", "last_pid"
 };

-const unsigned glibtop_types_loadavg[GLIBTOP_MAX_LOADAVG] =
+const unsigned glibtop_types_loadavg [GLIBTOP_MAX_LOADAVG] =
 {
-    GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_loadavg[GLIBTOP_MAX_LOADAVG] =
+const char *glibtop_labels_loadavg [GLIBTOP_MAX_LOADAVG] =
 {
-    N_ ("Load Average"),
-    N_ ("Running Tasks"),
-    N_ ("Number of Tasks"),
-    N_ ("Last PID")
+	N_("Load Average"),
+	N_("Running Tasks"),
+	N_("Number of Tasks"),
+	N_("Last PID")
 };

-const char *glibtop_descriptions_loadavg[GLIBTOP_MAX_LOADAVG] =
+const char *glibtop_descriptions_loadavg [GLIBTOP_MAX_LOADAVG] =
 {
-    N_ ("Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"),
-    N_ ("Number of tasks currently running"),
-    N_ ("Total number of tasks"),
-    N_ ("Last PID")
+	N_("Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"),
+	N_("Number of tasks currently running"),
+	N_("Total number of tasks"),
+	N_("Last PID")
 };
--- a/sysdeps/names/mem.c
+++ b/sysdeps/names/mem.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,43 +19,43 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/mem.h>

-const char *glibtop_names_mem[GLIBTOP_MAX_MEM] =
-{
-    "total", "used", "free", "shared", "buffer",
-    "cached", "user", "locked"
+const char *glibtop_names_mem [GLIBTOP_MAX_MEM] =
+{ 
+	"total", "used", "free", "shared", "buffer",
+	"cached", "user", "locked"
 };

-const unsigned glibtop_types_mem[GLIBTOP_MAX_MEM] =
-{
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+const unsigned glibtop_types_mem [GLIBTOP_MAX_MEM] =
+{ 
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_mem[GLIBTOP_MAX_MEM] =
+const char *glibtop_labels_mem [GLIBTOP_MAX_MEM] =
 {
-    N_ ("Total Memory"),
-    N_ ("Used Memory"),
-    N_ ("Free Memory"),
-    N_ ("Shared Memory"),
-    N_ ("Buffers"),
-    N_ ("Cached"),
-    N_ ("User"),
-    N_ ("Locked"),
+	N_("Total Memory"),
+	N_("Used Memory"),
+	N_("Free Memory"),
+	N_("Shared Memory"),
+	N_("Buffers"),
+	N_("Cached"),
+	N_("User"),
+	N_("Locked"),
 };

-const char *glibtop_descriptions_mem[GLIBTOP_MAX_MEM] =
+const char *glibtop_descriptions_mem [GLIBTOP_MAX_MEM] =
 {
-    N_ ("Total physical memory in kB"),
-    N_ ("Used memory size in kB"),
-    N_ ("Free memory size in kB"),
-    N_ ("Shared memory size in kB"),
-    N_ ("Size of buffers kB"),
-    N_ ("Size of cached memory in kB"),
-    N_ ("Memory used from user processes in kB"),
-    N_ ("Memory in locked pages in kB")
+	N_("Total physical memory in kB"),
+	N_("Used memory size in kB"),
+	N_("Free memory size in kB"),
+	N_("Shared memory size in kB"),
+	N_("Size of buffers kB"),
+	N_("Size of cached memory in kB"),
+	N_("Memory used from user processes in kB"),
+	N_("Memory in locked pages in kB")
 };
--- a/sysdeps/names/mountlist.c
+++ b/sysdeps/names/mountlist.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,14 +19,30 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/mountlist.h>

-const char *glibtop_names_mountlist[] = { 0 };
+const char *glibtop_names_mountlist [GLIBTOP_MAX_MOUNTLIST] =
+{
+	"number", "total", "size"
+};

-const unsigned glibtop_types_mountlist[] = { 0 };
+const unsigned glibtop_types_mountlist [GLIBTOP_MAX_MOUNTLIST] =
+{
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+};

-const char *glibtop_labels_mountlist[] = { 0 };
+const char *glibtop_labels_mountlist [GLIBTOP_MAX_MOUNTLIST] =
+{
+	N_("Number of list elements"),
+	N_("Total size of list"),
+	N_("Size of a single list element")
+};

-const char *glibtop_descriptions_mountlist[] = { 0 };
+const char *glibtop_descriptions_mountlist [GLIBTOP_MAX_MOUNTLIST] =
+{
+	N_("Number of list elements"),
+	N_("Total size of list"),
+	N_("Size of a single list element")
+};
--- a/sysdeps/names/msg_limits.c
+++ b/sysdeps/names/msg_limits.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,40 +19,40 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/msg_limits.h>

-const char *glibtop_names_msg_limits[GLIBTOP_MAX_MSG_LIMITS] =
+const char *glibtop_names_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 {
-    "msgpool", "msgmap", "msgmax", "msgmnb", "msgmni", "msgssz", "msgtql"
+	"msgpool", "msgmap", "msgmax", "msgmnb", "msgmni", "msgssz", "msgtql"
 };

-const unsigned glibtop_types_msg_limits[GLIBTOP_MAX_MSG_LIMITS] =
+const unsigned glibtop_types_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 {
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_msg_limits[GLIBTOP_MAX_MSG_LIMITS] =
+const char *glibtop_labels_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 {
-    N_ ("Size in kilobytes of message pool"),
-    N_ ("Number of entries in message map"),
-    N_ ("Max size of message"),
-    N_ ("Default max size of queue"),
-    N_ ("Max queues system wide"),
-    N_ ("Message segment size"),
-    N_ ("Number of system message headers")
+	N_("Size in kilobytes of message pool"),
+	N_("Number of entries in message map"),
+	N_("Max size of message"),
+	N_("Default max size of queue"),
+	N_("Max queues system wide"),
+	N_("Message segment size"),
+	N_("Number of system message headers")
 };

-const char *glibtop_descriptions_msg_limits[GLIBTOP_MAX_MSG_LIMITS] =
+const char *glibtop_descriptions_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 {
-    N_ ("Size in kilobytes of message pool"),
-    N_ ("Number of entries in message map"),
-    N_ ("Max size of message"),
-    N_ ("Default max size of queue"),
-    N_ ("Max queues system wide"),
-    N_ ("Message segment size"),
-    N_ ("Number of system message headers")
+	N_("Size in kilobytes of message pool"),
+	N_("Number of entries in message map"),
+	N_("Max size of message"),
+	N_("Default max size of queue"),
+	N_("Max queues system wide"),
+	N_("Message segment size"),
+	N_("Number of system message headers")
 };
--- a/sysdeps/names/netload.c
+++ b/sysdeps/names/netload.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,50 +19,59 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/netload.h>

-const char *glibtop_names_netload[GLIBTOP_MAX_NETLOAD] =
+const char *glibtop_names_netload [GLIBTOP_MAX_NETLOAD] =
 {
-    "packets_in", "packets_out", "packets_total",
-    "bytes_in", "bytes_out", "bytes_total",
-    "errors_in", "errors_out", "errors_total",
-    "collisions"
+	"if_flags", "mtu", "subnet", "address", "packets_in",
+	"packets_out", "packets_total", "bytes_in", "bytes_out",
+	"bytes_total", "errors_in", "errors_out", "errors_total",
+	"collisions"
 };

-const unsigned glibtop_types_netload[GLIBTOP_MAX_NETLOAD] =
-{
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG
+const unsigned glibtop_types_netload [GLIBTOP_MAX_NETLOAD] =
+{ 
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_netload[GLIBTOP_MAX_NETLOAD] =
+const char *glibtop_labels_netload [GLIBTOP_MAX_NETLOAD] =
 {
-    N_ ("Packets In"),
-    N_ ("Packets Out"),
-    N_ ("Packets Total"),
-    N_ ("Bytes In"),
-    N_ ("Bytes Out"),
-    N_ ("Bytes Total"),
-    N_ ("Errors In"),
-    N_ ("Errors Out"),
-    N_ ("Errors Total"),
-    N_ ("Collisions")
+	N_("Interface Flags"),
+	N_("MTU"),
+	N_("Subnet"),
+	N_("Address"),
+	N_("Packets In"),
+	N_("Packets Out"),
+	N_("Packets Total"),
+	N_("Bytes In"),
+	N_("Bytes Out"),
+	N_("Bytes Total"),
+	N_("Errors In"),
+	N_("Errors Out"),
+	N_("Errors Total"),
+	N_("Collisions")
 };

-const char *glibtop_descriptions_netload[GLIBTOP_MAX_NETLOAD] =
+const char *glibtop_descriptions_netload [GLIBTOP_MAX_NETLOAD] =
 {
-    N_ ("Packets In"),
-    N_ ("Packets Out"),
-    N_ ("Packets Total"),
-    N_ ("Bytes In"),
-    N_ ("Bytes Out"),
-    N_ ("Bytes Total"),
-    N_ ("Errors In"),
-    N_ ("Errors Out"),
-    N_ ("Errors Total"),
-    N_ ("Collisions")
+	N_("Interface Flags"),
+	N_("Maximum Transfer Unit"),
+	N_("Subnet"),
+	N_("Address"),
+	N_("Packets In"),
+	N_("Packets Out"),
+	N_("Packets Total"),
+	N_("Bytes In"),
+	N_("Bytes Out"),
+	N_("Bytes Total"),
+	N_("Errors In"),
+	N_("Errors Out"),
+	N_("Errors Total"),
+	N_("Collisions")
 };
--- a/sysdeps/names/ppp.c
+++ b/sysdeps/names/ppp.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,30 +19,30 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/ppp.h>

-const char *glibtop_names_ppp[GLIBTOP_MAX_PPP] =
+const char *glibtop_names_ppp [GLIBTOP_MAX_PPP] =
 {
-    "state", "bytes_in", "bytes_out"
+	"state", "bytes_in", "bytes_out"
 };

-const unsigned glibtop_types_ppp[GLIBTOP_MAX_PPP] =
-{
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+const unsigned glibtop_types_ppp [GLIBTOP_MAX_PPP] =
+{ 
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_ppp[GLIBTOP_MAX_PPP] =
+const char *glibtop_labels_ppp [GLIBTOP_MAX_PPP] =
 {
-    N_ ("PPP State"),
-    N_ ("Input bytes"),
-    N_ ("Output bytes")
+	N_("PPP State"),
+	N_("Input bytes"),
+	N_("Output bytes")
 };

-const char *glibtop_descriptions_ppp[GLIBTOP_MAX_PPP] =
+const char *glibtop_descriptions_ppp [GLIBTOP_MAX_PPP] =
 {
-    N_ ("PPP State"),
-    N_ ("Number of input bytes"),
-    N_ ("Number of output bytes")
+	N_("PPP State"),
+	N_("Number of input bytes"),
+	N_("Number of output bytes")
 };
--- a/sysdeps/names/procargs.c
+++ b/sysdeps/names/procargs.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,26 +19,26 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/procargs.h>

-const char *glibtop_names_proc_args[GLIBTOP_MAX_PROC_ARGS] =
+const char *glibtop_names_proc_args [GLIBTOP_MAX_PROC_ARGS] =
 {
-    "size"
+	"size"
 };

-const unsigned glibtop_types_proc_args[GLIBTOP_MAX_PROC_ARGS] =
+const unsigned glibtop_types_proc_args [GLIBTOP_MAX_PROC_ARGS] =
 {
-    GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_proc_args[GLIBTOP_MAX_PROC_ARGS] =
+const char *glibtop_labels_proc_args [GLIBTOP_MAX_PROC_ARGS] =
 {
-    N_ ("Size")
+	N_("Size")
 };

-const char *glibtop_descriptions_proc_args[GLIBTOP_MAX_PROC_ARGS] =
+const char *glibtop_descriptions_proc_args [GLIBTOP_MAX_PROC_ARGS] =
 {
-    N_ ("Length in bytes of the returned string.")
+	N_("Length in bytes of the returned string.")
 };
--- a/sysdeps/names/prockernel.c
+++ b/sysdeps/names/prockernel.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,64 +19,64 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop.h>
 #include <glibtop/prockernel.h>

-const char *glibtop_names_proc_kernel[GLIBTOP_MAX_PROC_KERNEL] =
+const char *glibtop_names_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 {
-    "k_flags", "min_flt", "maj_flt", "cmin_flt", "cmaj_flt",
-    "kstk_esp", "kstk_eip", "nwchan", "wchan"
+	"k_flags", "min_flt", "maj_flt", "cmin_flt", "cmaj_flt",
+	"kstk_esp", "kstk_eip", "nwchan", "wchan"
 };

-const unsigned glibtop_types_proc_kernel[GLIBTOP_MAX_PROC_KERNEL] =
+const unsigned glibtop_types_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 {
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_STRING
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_STRING
 };

-const char *glibtop_labels_proc_kernel[GLIBTOP_MAX_PROC_KERNEL] =
+const char *glibtop_labels_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 {
-    N_ ("K_Flags"), N_ ("Min_Flt"), N_ ("Maj_Flt"), N_ ("CMin_Flt"),
-    N_ ("CMaj_Flt"), N_ ("KStk_ESP"), N_ ("KStk_EIP"), N_ ("NWChan"),
-    N_ ("WChan")
+	N_("K_Flags"), N_("Min_Flt"), N_("Maj_Flt"), N_("CMin_Flt"),
+	N_("CMaj_Flt"), N_("KStk_ESP"), N_("KStk_EIP"), N_("NWChan"),
+	N_("WChan")
 };

-const char *glibtop_descriptions_proc_kernel[GLIBTOP_MAX_PROC_KERNEL] =
+const char *glibtop_descriptions_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 {
-    /* K_Flags */
-    N_ ("Kernel flags of the process.\n\n"
-	"On Linux, currently every flag has the math bit set, because "
-	"crt0.s checks for math emulation, so this is not included in "
-	"the output.\n\n"
-	"This is probably a bug, as not every process is a compiled C "
-	"program.\n\n"
-	"The math bit should be a decimal 4, and the traced bit is "
-	"decimal 10."),
-    /* Min_Flt */
-    N_ ("The number of minor faults the process has made, those which "
-	"have not required loading a memory page from disk."),
-    /* Maj_Flt */
-    N_ ("The number of major faults the process has made, those which "
-	"have required loading a memory page from disk."),
-    /* CMin_Flt */
-    N_ ("The number of minor faults that the process and its children "
-	"have made."),
-    /* CMaj_Flt */
-    N_ ("The number of major faults that the process and its children "
-	"have made."),
-    /* KStk_ESP */
-    N_ ("The current value of esp (32-bit stack pointer), as found in "
-	"the kernel stack page for the process."),
-    /* KStk_EIP */
-    N_ ("The current EIP (32-bit instruction pointer)."),
-    /* NWChan */
-    N_ ("This is the \"channel\" in which the process is waiting.  This "
-	"is the address of a system call, and can be looked up in a "
-	"namelist if you need a textual name.  (If you have an up-to-date "
-	"/etc/psdatabase, then try ps -l to see the WCHAN field in action)"),
-    /* WChan */
-    N_ ("This is the textual name of the `nwchan' field.")
+	/* K_Flags */
+	N_("Kernel flags of the process.\n\n"
+	   "On Linux, currently every flag has the math bit set, because "
+	   "crt0.s checks for math emulation, so this is not included in "
+	   "the output.\n\n"
+	   "This is probably a bug, as not every process is a compiled C "
+	   "program.\n\n"
+	   "The math bit should be a decimal 4, and the traced bit is "
+	   "decimal 10."),
+	/* Min_Flt */
+	N_("The number of minor faults the process has made, those which "
+	   "have not required loading a memory page from disk."),
+	/* Maj_Flt */
+	N_("The number of major faults the process has made, those which "
+	   "have required loading a memory page from disk."),
+	/* CMin_Flt */
+	N_("The number of minor faults that the process and its children "
+	   "have made."),
+	/* CMaj_Flt */
+	N_("The number of major faults that the process and its children "
+	   "have made."),
+	/* KStk_ESP */
+	N_("The current value of esp (32-bit stack pointer), as found in "
+	   "the kernel stack page for the process."),
+	/* KStk_EIP */
+	N_("The current EIP (32-bit instruction pointer)."),
+	/* NWChan */
+	N_("This is the \"channel\" in which the process is waiting.  This "
+	   "is the address of a system call, and can be looked up in a "
+	   "namelist if you need a textual name.  (If you have an up-to-date "
+	   "/etc/psdatabase, then try ps -l to see the WCHAN field in action)"),
+	/* WChan */
+	N_("This is the textual name of the `nwchan' field.")
 };
--- a/sysdeps/names/proclist.c
+++ b/sysdeps/names/proclist.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,14 +19,30 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/proclist.h>

-const char *glibtop_names_proclist[] = { 0 };
+const char *glibtop_names_proclist [GLIBTOP_MAX_PROCLIST] =
+{
+	"number", "total", "size"
+};

-const unsigned glibtop_types_proclist[] = { 0 };
+const unsigned glibtop_types_proclist [GLIBTOP_MAX_PROCLIST] =
+{
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+};

-const char *glibtop_labels_proclist[] = { 0 };
+const char *glibtop_labels_proclist [GLIBTOP_MAX_PROCLIST] =
+{
+	N_("Number of list elements"),
+	N_("Total size of list"),
+	N_("Size of a single list element")
+};

-const char *glibtop_descriptions_proclist[] = { 0 };
+const char *glibtop_descriptions_proclist [GLIBTOP_MAX_PROCLIST] =
+{
+	N_("Number of list elements"),
+	N_("Total size of list"),
+	N_("Size of a single list element")
+};
--- a/sysdeps/names/procmap.c
+++ b/sysdeps/names/procmap.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,14 +19,30 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/procmap.h>

-const char *glibtop_names_proc_map[] = { 0 };
+const char *glibtop_names_proc_map [GLIBTOP_MAX_PROC_MAP] =
+{
+	"number", "total", "size"
+};

-const unsigned glibtop_types_proc_map[] = { 0 };
+const unsigned glibtop_types_proc_map [GLIBTOP_MAX_PROC_MAP] =
+{
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+};

-const char *glibtop_labels_proc_map[] = { 0 };
+const char *glibtop_labels_proc_map [GLIBTOP_MAX_PROC_MAP] =
+{
+	N_("Number of list elements"),
+	N_("Total size of list"),
+	N_("Size of a single list element")
+};

-const char *glibtop_descriptions_proc_map[] = { 0 };
+const char *glibtop_descriptions_proc_map [GLIBTOP_MAX_PROC_MAP] =
+{
+	N_("Number of list elements"),
+	N_("Total size of list"),
+	N_("Size of a single list element")
+};
--- a/sysdeps/names/procmem.c
+++ b/sysdeps/names/procmem.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,7 +19,7 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop.h>
 #include <glibtop/procmem.h>
@@ -33,34 +31,34 @@
 #define GLIBTOP_PROC_MEM_RSS		4
 #define GLIBTOP_PROC_MEM_RSS_RLIM	5

-const char *glibtop_names_proc_mem[GLIBTOP_MAX_PROC_MEM] =
+const char *glibtop_names_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 {
-    "size", "vsize", "resident", "share", "rss", "rss_rlim"
+	"size", "vsize", "resident", "share", "rss", "rss_rlim"
 };

-const unsigned glibtop_types_proc_mem[GLIBTOP_MAX_PROC_MEM] =
+const unsigned glibtop_types_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 {
-    GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
-    GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG
+	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
+	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG
 };

-const char *glibtop_labels_proc_mem[GLIBTOP_MAX_PROC_MEM] =
+const char *glibtop_labels_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 {
-    N_ ("Size"), N_ ("Virtual"), N_ ("Resident"), N_ ("Share"),
-    N_ ("Resident Set Size"), N_ ("Resident Set Size Limit")
+	N_("Size"), N_("Virtual"), N_("Resident"), N_("Share"),
+	N_("Resident Set Size"), N_("Resident Set Size Limit")
 };

-const char *glibtop_descriptions_proc_mem[GLIBTOP_MAX_PROC_MEM] =
+const char *glibtop_descriptions_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 {
-    N_ ("Total # of pages of memory"),
-    N_ ("Number of pages of virtual memory"),
-    N_ ("Number of resident set (non-swapped) pages"),
-    N_ ("Number of pages of shared (mmap'd) memory"),
-    N_ ("Number of pages the process has in real memory, minus 3 "
-	"for administrative purposes. This is just the pages which "
-	"count towards text, data, or stack space. This does not "
-	"include pages which have not been demand-loaded in, or which "
-	"are swapped out."),
-    N_ ("Current limit in bytes on the rss of the process "
-	"(usually 2,147,483,647).")
+	N_("Total # of pages of memory"),
+	N_("Number of pages of virtual memory"),
+	N_("Number of resident set (non-swapped) pages"),
+	N_("Number of pages of shared (mmap'd) memory"),
+	N_("Number of pages the process has in real memory, minus 3 "
+	   "for administrative purposes. This is just the pages which "
+	   "count towards text, data, or stack space. This does not "
+	   "include pages which have not been demand-loaded in, or which "
+	   "are swapped out."),
+	N_("Current limit in bytes on the rss of the process "
+	   "(usually 2,147,483,647).")
 };
--- a/sysdeps/names/procsegment.c
+++ b/sysdeps/names/procsegment.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,56 +19,38 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop.h>
 #include <glibtop/procsegment.h>

-const char *glibtop_names_proc_segment[GLIBTOP_MAX_PROC_SEGMENT] =
+const char *glibtop_names_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 {
-    "text_rss", "shlib_rss", "data_rss", "stack_rss",
-    "dirty_size", "start_code", "end_code", "start_data",
-    "end_data", "start_brk", "end_brk", "start_stack",
-    "start_mmap", "arg_start", "arg_end", "env_start",
-    "env_end"
+	"text_rss", "shlib_rss", "data_rss", "stack_rss",
+	"dirty_size", "start_code", "end_code", "start_stack"
 };

-const unsigned glibtop_types_proc_segment[GLIBTOP_MAX_PROC_SEGMENT] =
+const unsigned glibtop_types_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 {
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_proc_segment[GLIBTOP_MAX_PROC_SEGMENT] =
+const char *glibtop_labels_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 {
-    N_ ("Text_RSS"), N_ ("ShLib_RSS"), N_ ("Data_RSS"), N_ ("Stack_RSS"),
-    N_ ("Dirty Size"), N_ ("Start_Code"), N_ ("End_Code"),
-    N_ ("Start_Data"), N_ ("End_Data"), N_ ("Start_Brk"), N_ ("Brk"),
-    N_ ("Start_Stack"), N_ ("Start_MMap"), N_ ("Arg_Start"),
-    N_ ("Arg_End"), N_ ("Env_Start"), N_ ("Env_End")
+	N_("Text_RSS"), N_("ShLib_RSS"), N_("Data_RSS"), N_("Stack_RSS"),
+	N_("Dirty Size"), N_("Start_Code"), N_("End_Code"), N_("Start_Stack")
 };

-const char *glibtop_descriptions_proc_segment[GLIBTOP_MAX_PROC_SEGMENT] =
+const char *glibtop_descriptions_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 {
-    N_ ("Text resident set size"),
-    N_ ("Shared-Lib resident set size"),
-    N_ ("Data resident set size"),
-    N_ ("Stack resident set size"),
-    N_ ("Total size of dirty pages"),
-    N_ ("Address of beginning of code segment"),
-    N_ ("Address of end of code segment"),
-    N_ ("Address of beginning of data segment"),
-    N_ ("Address of end of data segment"),
-    N_ ("Brk_Start"),
-    N_ ("Brk_End"),
-    N_ ("Address of the bottom of stack segment"),
-    N_ ("Start of mmap()ed areas"),
-    N_ ("Arg_Start"),
-    N_ ("Arg_End"),
-    N_ ("Env_Start"),
-    N_ ("Env_End")
+	N_("Text resident set size"),
+	N_("Shared-Lib resident set size"),
+	N_("Data resident set size"),
+	N_("Stack resident set size"),
+	N_("Total size of dirty pages"),
+	N_("Address of beginning of code segment"),
+	N_("Address of end of code segment"),
+	N_("Address of the bottom of stack segment")
 };
--- a/sysdeps/names/procsignal.c
+++ b/sysdeps/names/procsignal.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,31 +19,31 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop.h>
 #include <glibtop/procsignal.h>

-const char *glibtop_names_proc_signal[GLIBTOP_MAX_PROC_SIGNAL] =
+const char *glibtop_names_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 {
-    "signal", "blocked", "sigignore", "sigcatch"
+	"signal", "blocked", "sigignore", "sigcatch"
 };

-const unsigned glibtop_types_proc_signal[GLIBTOP_MAX_PROC_SIGNAL] =
+const unsigned glibtop_types_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 {
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-    GLIBTOP_TYPE_INT
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
+	GLIBTOP_TYPE_INT
 };

-const char *glibtop_labels_proc_signal[GLIBTOP_MAX_PROC_SIGNAL] =
+const char *glibtop_labels_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 {
-    N_ ("Signal"), N_ ("Blocked"), N_ ("SigIgnore"), N_ ("SigCatch")
+	N_("Signal"), N_("Blocked"), N_("SigIgnore"), N_("SigCatch")
 };

-const char *glibtop_descriptions_proc_signal[GLIBTOP_MAX_PROC_SIGNAL] =
+const char *glibtop_descriptions_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 {
-    N_ ("Mask of pending signals"),
-    N_ ("Mask of blocked signals"),
-    N_ ("Mask of ignored signals"),
-    N_ ("Mask of caught signals")
+	N_("Mask of pending signals"),
+	N_("Mask of blocked signals"),
+	N_("Mask of ignored signals"),
+	N_("Mask of caught signals")
 };
--- a/sysdeps/names/procstate.c
+++ b/sysdeps/names/procstate.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,41 +19,31 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop.h>
 #include <glibtop/procstate.h>

-const char *glibtop_names_proc_state[GLIBTOP_MAX_PROC_STATE] =
+const char *glibtop_names_proc_state [GLIBTOP_MAX_PROC_STATE] =
 {
-    "cmd", "state", "uid", "gid", "ruid", "rgid", "has_cpu",
-    "processor", "last_processor"
+	"cmd", "state", "uid", "gid"
 };

-const unsigned glibtop_types_proc_state[GLIBTOP_MAX_PROC_STATE] =
+const unsigned glibtop_types_proc_state [GLIBTOP_MAX_PROC_STATE] =
 {
-    GLIBTOP_TYPE_STRING, GLIBTOP_TYPE_UNSIGNED,
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-    GLIBTOP_TYPE_INT
+	GLIBTOP_TYPE_STRING, GLIBTOP_TYPE_CHAR,
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT
 };

-const char *glibtop_labels_proc_state[GLIBTOP_MAX_PROC_STATE] =
+const char *glibtop_labels_proc_state [GLIBTOP_MAX_PROC_STATE] =
 {
-    N_ ("Cmd"), N_ ("State"), N_ ("UID"), N_ ("GID"), N_ ("RUID"),
-    N_ ("RGID"), N_ ("Has CPU"), N_ ("Processor"),
-    N_ ("Last Processor")
+	N_("Cmd"), N_("State"), N_("UID"), N_("GID")
 };

-const char *glibtop_descriptions_proc_state[GLIBTOP_MAX_PROC_STATE] =
+const char *glibtop_descriptions_proc_state [GLIBTOP_MAX_PROC_STATE] =
 {
-    N_ ("Basename of executable file in call to exec()"),
-    N_ ("Single-Char code for process state (S=sleeping)"),
-    N_ ("effective UID of process"),
-    N_ ("effective GID of process"),
-    N_ ("real UID of process"),
-    N_ ("real GID of process"),
-    N_ ("has_cpu"),
-    N_ ("processor"),
-    N_ ("last_processor")
+	N_("Basename of executable file in call to exec()"),
+	N_("Single-Char code for process state (S=sleeping)"),
+	N_("UID of process"),
+	N_("GID of process")
 };
--- a/sysdeps/names/proctime.c
+++ b/sysdeps/names/proctime.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,47 +19,47 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop.h>
 #include <glibtop/proctime.h>

-const char *glibtop_names_proc_time[GLIBTOP_MAX_PROC_TIME] =
+const char *glibtop_names_proc_time [GLIBTOP_MAX_PROC_TIME] =
 {
-    "start_time", "rtime", "utime", "stime", "cutime", "cstime",
-    "timeout", "it_real_value", "timeout", "xcpu_utime",
-    "xcpu_stime", "xcpu_flags"
+	"start_time", "rtime", "utime", "stime", "cutime", "cstime",
+	"timeout", "it_real_value", "timeout", "xcpu_utime",
+	"xcpu_stime"
 };

-const unsigned glibtop_types_proc_time[GLIBTOP_MAX_PROC_TIME] =
+const unsigned glibtop_types_proc_time [GLIBTOP_MAX_PROC_TIME] =
 {
-    GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
-    GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
-    GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
-    GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG
+	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
+	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
+	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
+	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG
 };

-const char *glibtop_labels_proc_time[GLIBTOP_MAX_PROC_TIME] =
+const char *glibtop_labels_proc_time [GLIBTOP_MAX_PROC_TIME] =
 {
-    N_ ("Start_Time"), N_ ("RTime"), N_ ("UTime"), N_ ("STime"),
-    N_ ("CUTime"), N_ ("CSTime"), N_ ("TimeOut"), N_ ("It_Real_Value"),
-    N_ ("Frequency"), N_ ("XCPU_UTime"), N_ ("XCPU_STime"),
-    N_ ("XCPU_Flags")
+	N_("Start_Time"), N_("RTime"), N_("UTime"), N_("STime"),
+	N_("CUTime"), N_("CSTime"), N_("TimeOut"), N_("It_Real_Value"),
+	N_("Frequency"), N_("XCPU_UTime"), N_("XCPU_STime")
 };

-const char *glibtop_descriptions_proc_time[GLIBTOP_MAX_PROC_TIME] =
+const char *glibtop_descriptions_proc_time [GLIBTOP_MAX_PROC_TIME] =
 {
-    N_ ("Start time of process in seconds since the epoch"),
-    N_ ("Real time accumulated by process (should be utime + stime)"),
-    N_ ("user-mode CPU time accumulated by process"),
-    N_ ("kernel-mode CPU time accumulated by process"),
-    N_ ("cumulative utime of process and reaped children"),
-    N_ ("cumulative stime of process and reaped children"),
-    N_ ("The time (in jiffies) of the process's next timeout"),
-    N_ ("The time (in jiffies) before the next SIGALRM is sent "
-	"to the process due to an interval timer."),
-    N_ ("Tick frequency"),
-    N_ ("SMP user-mode CPU time accumulated by process"),
-    N_ ("SMP kernel-mode CPU time accumulated by process"),
-    N_ ("SMP CPU Flags")
+	N_("Start time of process in seconds since the epoch"),
+	N_("Real time accumulated by process (should be utime + stime)"),
+	N_("user-mode CPU time accumulated by process"),
+	N_("kernel-mode CPU time accumulated by process"),
+	N_("cumulative utime of process and reaped children"),
+	N_("cumulative stime of process and reaped children"),
+	N_("The time (in jiffies) of the process's next timeout"),
+	N_("The time (in jiffies) before the next SIGALRM is sent "
+	   "to the process due to an interval timer."),
+	N_("Tick frequency"),
+	N_("SMP user-mode CPU time accumulated by process"),
+	N_("SMP kernel-mode CPU time accumulated by process")
 };
+
+
--- a/sysdeps/names/procuid.c
+++ b/sysdeps/names/procuid.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,55 +19,57 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop.h>
 #include <glibtop/procuid.h>

-const char *glibtop_names_proc_uid[GLIBTOP_MAX_PROC_UID] =
+#define GLIBTOP_PROC_UID_UID		0
+#define GLIBTOP_PROC_UID_EUID		1
+#define GLIBTOP_PROC_UID_GID		2
+#define GLIBTOP_PROC_UID_EGID		3
+#define GLIBTOP_PROC_UID_PID		4
+#define GLIBTOP_PROC_UID_PPID		5
+#define GLIBTOP_PROC_UID_PGRP		6
+#define GLIBTOP_PROC_UID_SESSION	7
+#define GLIBTOP_PROC_UID_TTY		8
+#define GLIBTOP_PROC_UID_TPGID		9
+#define GLIBTOP_PROC_UID_PRIORITY	10
+#define GLIBTOP_PROC_UID_NICE		11
+
+const char *glibtop_names_proc_uid [GLIBTOP_MAX_PROC_UID] =
 {
-    "uid", "euid", "gid", "egid", "suid", "sgid", "fsuid", "fsgid",
-    "pid", "ppid", "pgrp", "session", "tty", "tpgid", "priority",
-    "nice", "ngroups", "groups"
+	"uid", "euid", "gid", "egid", "pid", "ppid", "pgrp",
+	"session", "tty", "tpgid", "priority", "nice"
 };

-const unsigned glibtop_types_proc_uid[GLIBTOP_MAX_PROC_UID] =
+const unsigned glibtop_types_proc_uid [GLIBTOP_MAX_PROC_UID] =
 {
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-    GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT
 };

-const char *glibtop_labels_proc_uid[GLIBTOP_MAX_PROC_UID] =
+const char *glibtop_labels_proc_uid [GLIBTOP_MAX_PROC_UID] =
 {
-    N_ ("Uid"), N_ ("EUid"), N_ ("Gid"), N_ ("EGid"), N_ ("SUid"),
-    N_ ("SGid"), N_ ("FsUid"), N_ ("FsGid"), N_ ("Pid"),
-    N_ ("PPid"), N_ ("PGrp"), N_ ("Session"), N_ ("Tty"),
-    N_ ("TPGid"), N_ ("Priority"), N_ ("Nice"), N_ ("NGroups"),
-    N_ ("Groups")
+	N_("Uid"), N_("EUid"), N_("Gid"), N_("EGid"), N_("Pid"),
+	N_("PPid"), N_("PGrp"), N_("Session"), N_("Tty"),
+	N_("TPGid"), N_("Priority"), N_("Nice")
 };

-const char *glibtop_descriptions_proc_uid[GLIBTOP_MAX_PROC_UID] =
+const char *glibtop_descriptions_proc_uid [GLIBTOP_MAX_PROC_UID] =
 {
-    N_ ("User ID"),
-    N_ ("Effective User ID"),
-    N_ ("Group ID"),
-    N_ ("Effective Group ID"),
-    N_ ("Saved User ID"),
-    N_ ("Saved Group ID"),
-    N_ ("Filesystem User ID"),
-    N_ ("Filesystem Group ID"),
-    N_ ("Process ID"),
-    N_ ("PID of parent process"),
-    N_ ("Process group ID"),
-    N_ ("Session ID"),
-    N_ ("Full device number of controlling terminal"),
-    N_ ("Terminal process group ID"),
-    N_ ("Kernel scheduling priority"),
-    N_ ("Standard unix nice level of process"),
-    N_ ("Number of additional process groups"),
-    N_ ("Additional process groups")
+	N_("User ID"),
+	N_("Effective User ID"),
+	N_("Group ID"),
+	N_("Effective Group ID"),
+	N_("Process ID"),
+	N_("PID of parent process"),
+	N_("Process group ID"),
+	N_("Session ID"),
+	N_("Full device number of controlling terminal"),
+	N_("Terminal process group ID"),
+	N_("Kernel scheduling priority"),
+	N_("Standard unix nice level of process")
 };
--- a/sysdeps/names/sem_limits.c
+++ b/sysdeps/names/sem_limits.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,48 +19,48 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/sem_limits.h>

-const char *glibtop_names_sem_limits[GLIBTOP_MAX_SEM_LIMITS] =
+const char *glibtop_names_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 {
-    "semmap", "semmni", "semmns", "semmnu", "semmsl",
-    "semopm", "semume", "semusz", "semvmx", "semaem"
+	"semmap", "semmni", "semmns", "semmnu", "semmsl",
+	"semopm", "semume", "semusz", "semvmx", "semaem"
 };

-const unsigned glibtop_types_sem_limits[GLIBTOP_MAX_SEM_LIMITS] =
+const unsigned glibtop_types_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 {
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_sem_limits[GLIBTOP_MAX_SEM_LIMITS] =
+const char *glibtop_labels_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 {
-    N_ ("Number of entries in semaphore map"),
-    N_ ("Max number of arrays"),
-    N_ ("Max semaphores system wide"),
-    N_ ("Number of undo structures system wide"),
-    N_ ("Max semaphores per array"),
-    N_ ("Max ops per semop call"),
-    N_ ("Max number of undo entries per process"),
-    N_ ("sizeof struct sem_undo"),
-    N_ ("Semaphore max value"),
-    N_ ("Adjust on exit max value")
+	N_("Number of entries in semaphore map"),
+	N_("Max number of arrays"),
+	N_("Max semaphores system wide"),
+	N_("Number of undo structures system wide"),
+	N_("Max semaphores per array"),
+	N_("Max ops per semop call"),
+	N_("Max number of undo entries per process"),
+	N_("sizeof struct sem_undo"),
+	N_("Semaphore max value"),
+	N_("Adjust on exit max value")
 };

-const char *glibtop_descriptions_sem_limits[GLIBTOP_MAX_SEM_LIMITS] =
+const char *glibtop_descriptions_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 {
-    N_ ("Number of entries in semaphore map"),
-    N_ ("Max number of arrays"),
-    N_ ("Max semaphores system wide"),
-    N_ ("Number of undo structures system wide"),
-    N_ ("Max semaphores per array"),
-    N_ ("Max ops per semop call"),
-    N_ ("Max number of undo entries per process"),
-    N_ ("sizeof struct sem_undo"),
-    N_ ("Semaphore max value"),
-    N_ ("Adjust on exit max value")
+	N_("Number of entries in semaphore map"),
+	N_("Max number of arrays"),
+	N_("Max semaphores system wide"),
+	N_("Number of undo structures system wide"),
+	N_("Max semaphores per array"),
+	N_("Max ops per semop call"),
+	N_("Max number of undo entries per process"),
+	N_("sizeof struct sem_undo"),
+	N_("Semaphore max value"),
+	N_("Adjust on exit max value")
 };
--- a/sysdeps/names/shm_limits.c
+++ b/sysdeps/names/shm_limits.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,35 +19,35 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/shm_limits.h>

-const char *glibtop_names_shm_limits[GLIBTOP_MAX_SHM_LIMITS] =
+const char *glibtop_names_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 {
-    "shmmax", "shmmin", "shmmni", "shmseg", "shmall"
+	"shmmax", "shmmin", "shmmni", "shmseg", "shmall"
 };

-const unsigned glibtop_types_shm_limits[GLIBTOP_MAX_SHM_LIMITS] =
+const unsigned glibtop_types_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 {
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_shm_limits[GLIBTOP_MAX_SHM_LIMITS] =
+const char *glibtop_labels_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 {
-    N_ ("Max segment size"),
-    N_ ("Min segment size"),
-    N_ ("Max number of segments"),
-    N_ ("Max shared segments per process"),
-    N_ ("Max total shared memory")
+	N_("Max segment size"),
+	N_("Min segment size"),
+	N_("Max number of segments"),
+	N_("Max shared segments per process"),
+	N_("Max total shared memory")
 };

-const char *glibtop_descriptions_shm_limits[GLIBTOP_MAX_SHM_LIMITS] =
+const char *glibtop_descriptions_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 {
-    N_ ("Max segment size"),
-    N_ ("Min segment size"),
-    N_ ("Max number of segments"),
-    N_ ("Max shared segments per process"),
-    N_ ("Max total shared memory")
+	N_("Max segment size"),
+	N_("Min segment size"),
+	N_("Max number of segments"),
+	N_("Max shared segments per process"),
+	N_("Max total shared memory")
 };
--- a/sysdeps/names/swap.c
+++ b/sysdeps/names/swap.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,37 +19,37 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/swap.h>

-const char *glibtop_names_swap[GLIBTOP_MAX_SWAP] =
+const char *glibtop_names_swap [GLIBTOP_MAX_SWAP] =
 {
-    "total", "used", "free", "pagein", "pageout"
+	"total", "used", "free", "pagein", "pageout"
 };

-const unsigned glibtop_types_swap[GLIBTOP_MAX_SWAP] =
+const unsigned glibtop_types_swap [GLIBTOP_MAX_SWAP] =
 {
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_swap[GLIBTOP_MAX_SWAP] =
+const char *glibtop_labels_swap [GLIBTOP_MAX_SWAP] =
 {
-    N_ ("Total Swap Space"),
-    N_ ("Used Swap Space"),
-    N_ ("Free Swap Space"),
-    N_ ("Page In"),
-    N_ ("Page Out"),
+	N_("Total Swap Space"),
+	N_("Used Swap Space"),
+	N_("Free Swap Space"),
+	N_("Page In"),
+	N_("Page Out"),
 };

-const char *glibtop_descriptions_swap[GLIBTOP_MAX_SWAP] =
+const char *glibtop_descriptions_swap [GLIBTOP_MAX_SWAP] =
 {
-    N_ ("Total Swap Space"),
-    N_ ("Used Swap Space"),
-    N_ ("Free Swap Space"),
-    N_ ("Total number of swap pages that have been brought in "
-	"since system boot"),
-    N_ ("Total number of swap pages that have been brought out "
-	"since system boot"),
+	N_("Total Swap Space"),
+	N_("Used Swap Space"),
+	N_("Free Swap Space"),
+	N_("Total number of swap pages that have been brought in "
+	   "since system boot"),
+	N_("Total number of swap pages that have been brought out "
+	   "since system boot"),
 };
--- a/sysdeps/names/sysdeps.c
+++ b/sysdeps/names/sysdeps.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* Copyright (C) 1998-99 Martin Baulig
   This file is part of LibGTop 1.0.

@@ -19,91 +17,83 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <config.h>
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>

-const char *glibtop_names_sysdeps[GLIBTOP_MAX_SYSDEPS] =
+const char *glibtop_names_sysdeps [GLIBTOP_MAX_SYSDEPS] =
 {
-    "features", "pointer_size", "cpu", "mem", "swap", "uptime",
-    "loadavg", "shm_limits", "msg_limits", "sem_limits", "proclist",
-    "proc_state", "proc_uid", "proc_mem", "proc_time",
-    "proc_signal", "proc_kernel", "proc_segment", "proc_cwd", "proc_args",
-    "proc_map", "mountlist", "fsusage", "netload", "interface_names",
-    "ppp"
+	"features", "cpu", "mem", "swap", "uptime", "loadavg",
+	"shm_limits", "msg_limits", "sem_limits", "proclist",
+	"proc_state", "proc_uid", "proc_mem", "proc_time",
+	"proc_signal", "proc_kernel", "proc_segment", "proc_args",
+	"proc_map", "mountlist", "fsusage", "netload", "ppp"
 };

-const unsigned glibtop_types_sysdeps[GLIBTOP_MAX_SYSDEPS] =
+const unsigned glibtop_types_sysdeps [GLIBTOP_MAX_SYSDEPS] =
 {
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

-const char *glibtop_labels_sysdeps[GLIBTOP_MAX_SYSDEPS] =
+const char *glibtop_labels_sysdeps [GLIBTOP_MAX_SYSDEPS] =
 {
-    N_ ("Server Features"),
-    N_ ("Pointer Size"),
-    N_ ("CPU Usage"),
-    N_ ("Memory Usage"),
-    N_ ("Swap Usage"),
-    N_ ("System Uptime"),
-    N_ ("Load Averange"),
-    N_ ("Shared Memory Limits"),
-    N_ ("Message Queue Limits"),
-    N_ ("Semaphore Set Limits"),
-    N_ ("List of running Processes"),
-    N_ ("Process Status information"),
-    N_ ("Process UID and TTY information"),
-    N_ ("Process Memory information"),
-    N_ ("Process Time information"),
-    N_ ("Process Signal information"),
-    N_ ("Process Kernel Data information"),
-    N_ ("Process Segment information"),
-    N_ ("Process CWD"),
-    N_ ("Process Arguments"),
-    N_ ("Process Memory Map"),
-    N_ ("Mount List"),
-    N_ ("File System Usage"),
-    N_ ("Network Load"),
-    N_ ("Interface Names"),
-    N_ ("PPP Statistics")
+	N_("Server Features"),
+	N_("CPU Usage"),
+	N_("Memory Usage"),
+	N_("Swap Usage"),
+	N_("System Uptime"),
+	N_("Load Averange"),
+	N_("Shared Memory Limits"),
+	N_("Message Queue Limits"),
+	N_("Semaphore Set Limits"),
+	N_("List of running Processes"),
+	N_("Process Status information"),
+	N_("Process UID and TTY information"),
+	N_("Process Memory information"),
+	N_("Process Time information"),
+	N_("Process Signal information"),
+	N_("Process Kernel Data information"),
+	N_("Process Segment information"),
+	N_("Process Arguments"),
+	N_("Process Memory Map"),
+	N_("Mount List"),
+	N_("File System Usage"),
+	N_("Network Load"),
+	N_("PPP Statistics")
 };

-const char *glibtop_descriptions_sysdeps[GLIBTOP_MAX_SYSDEPS] =
+const char *glibtop_descriptions_sysdeps [GLIBTOP_MAX_SYSDEPS] =
 {
-    N_ ("Server Features"),
-    N_ ("Pointer Size on the Server (in bits)"),
-    N_ ("CPU Usage"),
-    N_ ("Memory Usage"),
-    N_ ("Swap Usage"),
-    N_ ("System Uptime"),
-    N_ ("Load Averange"),
-    N_ ("Shared Memory Limits"),
-    N_ ("Message Queue Limits"),
-    N_ ("Semaphore Set Limits"),
-    N_ ("List of running Processes"),
-    N_ ("Process Status information"),
-    N_ ("Process UID and TTY information"),
-    N_ ("Process Memory information"),
-    N_ ("Process Time information"),
-    N_ ("Process Signal information"),
-    N_ ("Process Kernel Data information"),
-    N_ ("Process Segment information"),
-    N_ ("Current working directory of the process"),
-    N_ ("Command line arguments of the process"),
-    N_ ("Process Memory Map"),
-    N_ ("List of currently mounted filesystems"),
-    N_ ("File System Usage"),
-    N_ ("Network Load"),
-    N_ ("Interface Names"),
-    N_ ("PPP Statistics")
+	N_("Server Features"),
+	N_("CPU Usage"),
+	N_("Memory Usage"),
+	N_("Swap Usage"),
+	N_("System Uptime"),
+	N_("Load Averange"),
+	N_("Shared Memory Limits"),
+	N_("Message Queue Limits"),
+	N_("Semaphore Set Limits"),
+	N_("List of running Processes"),
+	N_("Process Status information"),
+	N_("Process UID and TTY information"),
+	N_("Process Memory information"),
+	N_("Process Time information"),
+	N_("Process Signal information"),
+	N_("Process Kernel Data information"),
+	N_("Process Segment information"),
+	N_("Command line arguments of the process"),
+	N_("Process Memory Map"),
+	N_("List of currently mounted filesystems"),
+	N_("File System Usage"),
+	N_("Network Load"),
+	N_("PPP Statistics")
 };
--- a/sysdeps/names/uptime.c
+++ b/sysdeps/names/uptime.c
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
@@ -21,30 +19,28 @@
   along with LibGTop; see the file COPYING. If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
- */
+*/

 #include <glibtop/uptime.h>

-const char *glibtop_names_uptime[GLIBTOP_MAX_UPTIME] =
+const char *glibtop_names_uptime [GLIBTOP_MAX_UPTIME] =
 {
-    "uptime", "idletime", "boot_time"
+	"uptime", "idletime"
 };

-const unsigned glibtop_types_uptime[GLIBTOP_MAX_UPTIME] =
+const unsigned glibtop_types_uptime [GLIBTOP_MAX_UPTIME] =
 {
-    GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_ULONG
+	GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_DOUBLE
 };

-const char *glibtop_labels_uptime[GLIBTOP_MAX_UPTIME] =
+const char *glibtop_labels_uptime [GLIBTOP_MAX_UPTIME] =
 {
-    N_ ("Uptime"),
-    N_ ("Idletime"),
-    N_ ("Boot time")
+	N_("Uptime"),
+	N_("Idletime")
 };

-const char *glibtop_descriptions_uptime[GLIBTOP_MAX_UPTIME] =
+const char *glibtop_descriptions_uptime [GLIBTOP_MAX_UPTIME] =
 {
-    N_ ("Time in seconds since system boot"),
-    N_ ("Time in seconds the system spent in the idle task since system boot"),
-    N_ ("Boot time (seconds sice epoch)")
+	N_("Time in seconds since system boot"),
+	N_("Time in seconds the system spent in the idle task since system boot")
 };