Added `#include <types.h>'.

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

        * glibtop.h: Added `#include <types.h>'.

        * include/glibtop/types.h: New file - numeric constants
        for `glibtop_types_<feature>'.

        * sysdeps/names/*.c (glibtop_types_*): Using numeric
        constants from `types.h' instead of string constants.

glibtop.h

@@ -25,6 +25,7 @@
 #include <glibtop/global.h>
 
 #include <glibtop_server.h>
+#include <glibtop/types.h>
 
 #ifdef HAVE_GLIBTOP_MACHINE_H
 #include <glibtop_machine.h>

include/glibtop/types.h

@@ -0,0 +1,36 @@
+/* $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.  */
+
+#ifndef __GLIBTOP_TYPES_H__
+#define __GLIBTOP_TYPES_H__
+
+__BEGIN_DECLS
+
+#define GLIBTOP_TYPE_LONG	1
+#define GLIBTOP_TYPE_ULONG	2
+#define GLIBTOP_TYPE_DOUBLE	3
+#define GLIBTOP_TYPE_INT	4
+#define GLIBTOP_TYPE_CHAR	5
+#define GLIBTOP_TYPE_STRING	6
+
+__END_DECLS
+
+#endif

sysdeps/names/cpu.c

@@ -28,8 +28,8 @@ const char *glibtop_names_cpu [GLIBTOP_MAX_CPU] =
 
 const char *glibtop_types_cpu [GLIBTOP_MAX_CPU] =
 { 
-	"unsigned long", "unsigned long", "unsigned long",
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-	"unsigned long", "unsigned long", "unsigned long"
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_cpu [GLIBTOP_MAX_CPU] =

sysdeps/names/loadavg.c

@@ -28,7 +28,7 @@ const char *glibtop_names_loadavg [GLIBTOP_MAX_LOADAVG] =
 
 const char *glibtop_types_loadavg [GLIBTOP_MAX_LOADAVG] =
 {
-	"double"
+	GLIBTOP_TYPE_DOUBLE
 };
 
 const char *glibtop_labels_loadavg [GLIBTOP_MAX_LOADAVG] =

sysdeps/names/mem.c

@@ -29,9 +29,9 @@ const char *glibtop_names_mem [GLIBTOP_MAX_MEM] =
 
 const char *glibtop_types_mem [GLIBTOP_MAX_MEM] =
 { 
-	"unsigned long", "unsigned long", "unsigned long",
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-	"unsigned long", "unsigned long", "unsigned long",
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-	"unsigned long", "unsigned long"
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_mem [GLIBTOP_MAX_MEM] =

sysdeps/names/msg_limits.c

@@ -28,8 +28,9 @@ const char *glibtop_names_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 
 const char *glibtop_types_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 {
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long",
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-	"unsigned long", "unsigned long", "unsigned long"
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =

sysdeps/names/prockernel.c

@@ -30,8 +30,9 @@ const char *glibtop_names_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 
 const char *glibtop_types_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 {
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long",
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long"
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =

sysdeps/names/proclist.c

@@ -28,7 +28,7 @@ const char *glibtop_names_proclist [GLIBTOP_MAX_PROCLIST] =
 
 const char *glibtop_types_proclist [GLIBTOP_MAX_PROCLIST] =
 {
-	"unsigned long", "unsigned long", "unsigned long"
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_proclist [GLIBTOP_MAX_PROCLIST] =

sysdeps/names/procmem.c

@@ -36,7 +36,8 @@ const char *glibtop_names_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 
 const char *glibtop_types_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 {
-	"long", "long", "long", "long", "long", "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] =

sysdeps/names/procsegment.c

@@ -29,8 +29,9 @@ const char *glibtop_names_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 
 const char *glibtop_types_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 {
-	"long", "long", "long", "long", "unsigned long",
+	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
-	"unsigned long", "unsigned long"
+	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =

sysdeps/names/procsignal.c

@@ -29,7 +29,8 @@ const char *glibtop_names_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 
 const char *glibtop_types_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 {
-	"int", "int", "int", "int"
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
+	GLIBTOP_TYPE_INT
 };
 
 const char *glibtop_labels_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =

sysdeps/names/procstate.c

@@ -29,7 +29,8 @@ const char *glibtop_names_proc_state [GLIBTOP_MAX_PROC_STATE] =
 
 const char *glibtop_types_proc_state [GLIBTOP_MAX_PROC_STATE] =
 {
-	"char *", "char", "int", "int"
+	GLIBTOP_TYPE_STRING, GLIBTOP_TYPE_CHAR,
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT
 };
 
 const char *glibtop_labels_proc_state [GLIBTOP_MAX_PROC_STATE] =

sysdeps/names/proctime.c

@@ -38,7 +38,9 @@ const char *glibtop_names_proc_time [GLIBTOP_MAX_PROC_TIME] =
 
 const char *glibtop_types_proc_time [GLIBTOP_MAX_PROC_TIME] =
 {
-	"long", "long", "long", "long", "long", "long", "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] =

sysdeps/names/procuid.c

@@ -43,8 +43,10 @@ const char *glibtop_names_proc_uid [GLIBTOP_MAX_PROC_UID] =
 
 const char *glibtop_types_proc_uid [GLIBTOP_MAX_PROC_UID] =
 {
-	"int", "int", "int", "int", "int", "int", "int",
+	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
-	"int", "int", "int", "int", "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] =

sysdeps/names/sem_limits.c

@@ -29,9 +29,10 @@ const char *glibtop_names_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 
 const char *glibtop_types_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 {
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long",
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long",
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-	"unsigned long", "unsigned long"
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
+	GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =

sysdeps/names/shm_limits.c

@@ -28,8 +28,8 @@ const char *glibtop_names_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 
 const char *glibtop_types_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 {
-	"unsigned long", "unsigned long", "unsigned long",
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-	"unsigned long", "unsigned long"
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =

sysdeps/names/swap.c

@@ -28,7 +28,7 @@ const char *glibtop_names_swap [GLIBTOP_MAX_SWAP] =
 
 const char *glibtop_types_swap [GLIBTOP_MAX_SWAP] =
 {
-	"unsigned long", "unsigned long", "unsigned long"
+	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_swap [GLIBTOP_MAX_SWAP] =

sysdeps/names/uptime.c

@@ -28,7 +28,7 @@ const char *glibtop_names_uptime [GLIBTOP_MAX_UPTIME] =
 
 const char *glibtop_types_uptime [GLIBTOP_MAX_UPTIME] =
 {
-	"double", "double"
+	GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_DOUBLE
 };
 
 const char *glibtop_labels_uptime [GLIBTOP_MAX_UPTIME] =