Removed that file.

1998-06-06  Martin Baulig  <martin@home-of-linux.org>

        * sysdeps/names/procdata.c: Removed that file.

	* sysdeps/names/*.c: Fixed declaration of `glibtop_types_*'.

sysdeps/names/cpu.c

@@ -26,7 +26,7 @@ const char *glibtop_names_cpu [GLIBTOP_MAX_CPU] =
 	"total", "user", "nice", "sys", "idle", "frequency"
 };
 
-const char *glibtop_types_cpu [GLIBTOP_MAX_CPU] =
+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

sysdeps/names/mem.c

@@ -27,7 +27,7 @@ const char *glibtop_names_mem [GLIBTOP_MAX_MEM] =
 	"cached", "user", "locked"
 };
 
-const char *glibtop_types_mem [GLIBTOP_MAX_MEM] =
+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,

sysdeps/names/msg_limits.c

@@ -26,7 +26,7 @@ const char *glibtop_names_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 	"msgpool", "msgmap", "msgmax", "msgmnb", "msgmni", "msgssz", "msgtql"
 };
 
-const char *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,

sysdeps/names/procdata.c

@@ -1,53 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop/procdata.h>
-
-const char *glibtop_names_procdata [GLIBTOP_MAX_PROCDATA] =
-{ "cmd", "state", "uid", "pid", "ppid", "pgrp", "session",
-  "tty", "tpgid", "priority", "nice", "signal", "blocked",
-  "sigignore", "sigcatch", "start_time", "utime", "stime",
-  "cutime", "cstime", "size", "resident", "share", "trs",
-  "lrs", "drs", "dt", "vsize", "rss", "rss_rlim", "timeout",
-  "it_real_value", "k_flags", "min_flt", "maj_flt", "cmin_flt",
-  "cmaj_flt", "start_code", "end_code", "start_stack",
-  "kstk_esp", "kstk_eip", "wchan"
-};
-
-const char *glibtop_labels_procdata [GLIBTOP_MAX_PROCDATA] =
-{ N_("Cmd"), N_("Stat"), N_("UID"), N_("PID"), N_("PPID"), N_("PGRP"),
-  N_("Session"), N_("Tty"), N_("TPGID"), N_("Priority"), N_("Nice"),
-  N_("Signal"), N_("Blocked"), N_("SigIgnore"), N_("SigCatch"),
-  N_("Start_Time"), N_("UTime"), N_("STime"), N_("CUTime"), N_("CSTime"),
-  N_("Size"), N_("Resident"), N_("Share"), N_("TRS"), N_("LRS"), N_("DRS"),
-  N_("DT"), N_("VSize"), N_("RSS"), N_("RSS_RLim"), N_("Timeout"),
-  N_("It_Real_Value"), N_("Flags"), N_("Min_Flt"), N_("Maj_Flt"),
-  N_("CMin_Flt"), N_("Cmaj_Flt"), N_("Start_Code"), N_("End_Code"),
-  N_("Start_Stack"), N_("KSTK_ESP"), N_("KSTK_EIP"), N_("WChan")
-};
-
-const char *glibtop_descriptions_procdata [GLIBTOP_MAX_PROCDATA] =
-{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL
-};

sysdeps/names/prockernel.c

@@ -28,7 +28,7 @@ const char *glibtop_names_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 	"kstk_esp", "kstk_eip", "wchan"
 };
 
-const char *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,

sysdeps/names/proclist.c

@@ -26,7 +26,7 @@ const char *glibtop_names_proclist [GLIBTOP_MAX_PROCLIST] =
 	"number", "total", "size"
 };
 
-const char *glibtop_types_proclist [GLIBTOP_MAX_PROCLIST] =
+const unsigned glibtop_types_proclist [GLIBTOP_MAX_PROCLIST] =
 {
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

sysdeps/names/procmem.c

@@ -34,7 +34,7 @@ const char *glibtop_names_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 	"size", "vsize", "resident", "share", "rss", "rss_rlim"
 };
 
-const char *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

sysdeps/names/procsegment.c

@@ -27,7 +27,7 @@ const char *glibtop_names_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 	"trs", "lrs", "drs", "dt", "start_code", "end_code", "start_stack"
 };
 
-const char *glibtop_types_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
+const unsigned glibtop_types_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 {
 	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
 	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,

sysdeps/names/procsignal.c

@@ -27,7 +27,7 @@ const char *glibtop_names_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 	"signal", "blocked", "sigignore", "sigcatch"
 };
 
-const char *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

sysdeps/names/procstate.c

@@ -27,7 +27,7 @@ const char *glibtop_names_proc_state [GLIBTOP_MAX_PROC_STATE] =
 	"cmd", "state", "uid", "gid"
 };
 
-const char *glibtop_types_proc_state [GLIBTOP_MAX_PROC_STATE] =
+const unsigned glibtop_types_proc_state [GLIBTOP_MAX_PROC_STATE] =
 {
 	GLIBTOP_TYPE_STRING, GLIBTOP_TYPE_CHAR,
 	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT

sysdeps/names/proctime.c

@@ -36,7 +36,7 @@ const char *glibtop_names_proc_time [GLIBTOP_MAX_PROC_TIME] =
 	"timeout", "it_real_value"
 };
 
-const char *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,

sysdeps/names/procuid.c

@@ -41,7 +41,7 @@ const char *glibtop_names_proc_uid [GLIBTOP_MAX_PROC_UID] =
 	"session", "tty", "tpgid", "priority", "nice"
 };
 
-const char *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,

sysdeps/names/sem_limits.c

@@ -27,7 +27,7 @@ const char *glibtop_names_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 	"semopm", "semume", "semusz", "semvmx", "semaem"
 };
 
-const char *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,

sysdeps/names/shm_limits.c

@@ -26,7 +26,7 @@ const char *glibtop_names_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 	"shmmax", "shmmin", "shmmni", "shmseg", "shmall"
 };
 
-const char *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

sysdeps/names/swap.c

@@ -26,7 +26,7 @@ const char *glibtop_names_swap [GLIBTOP_MAX_SWAP] =
 	"total", "used", "free"
 };
 
-const char *glibtop_types_swap [GLIBTOP_MAX_SWAP] =
+const unsigned glibtop_types_swap [GLIBTOP_MAX_SWAP] =
 {
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };

sysdeps/names/uptime.c

@@ -26,7 +26,7 @@ const char *glibtop_names_uptime [GLIBTOP_MAX_UPTIME] =
 	"uptime", "idletime"
 };
 
-const char *glibtop_types_uptime [GLIBTOP_MAX_UPTIME] =
+const unsigned glibtop_types_uptime [GLIBTOP_MAX_UPTIME] =
 {
 	GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_DOUBLE
 };