Forgot to change declaration on Jun 6.

1998-06-12  Martin Baulig  <baulig@taurus.uni-trier.de>

	* include/glibtop/sysdeps.h (glibtop_types_sysdeps):
	Forgot to change declaration on Jun 6.

	* sysdeps/names/sysdeps.c (glibtop_types_sysdeps):
	Using numeric constants from `types.h' instead of string
	constants; forgot to change this on Jun 6. Added information
	about new `features' field of `_glibtop_sysdeps'.

20 files changed, 43 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a0132e7..0128056d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 1998-06-12  Martin Baulig  <baulig@taurus.uni-trier.de>
 
+	* include/glibtop/sysdeps.h (glibtop_types_sysdeps):
+	Forgot to change declaration on Jun 6.
+	
+	* sysdeps/names/sysdeps.c (glibtop_types_sysdeps):
+	Using numeric constants from `types.h' instead of string
+	constants; forgot to change this on Jun 6. Added information
+	about new `features' field of `_glibtop_sysdeps'.
+
+	* sysdeps/guile/names/*.c (glibtop_guile_types_*):
+	Using `gh_ulong2scm' instead of `gh_str02scm'.
+
 	* sysdeps/guile/proclist.c: Replaced call to
 	`gh_append2 ()' with `gh_append ()'.
 
diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h
index e2491008..8436a81c 100644
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -27,7 +27,7 @@
 
 __BEGIN_DECLS
 
-#define GLIBTOP_SYSDEPS_DUMMY		0
+#define GLIBTOP_SYSDEPS_FEATURES	0
 #define GLIBTOP_SYSDEPS_CPU		1
 #define GLIBTOP_SYSDEPS_MEM		2
 #define GLIBTOP_SYSDEPS_SWAP		3
@@ -101,7 +101,7 @@ extern SCM glibtop_guile_descriptions_sysdeps __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_sysdeps [];
-extern const char *glibtop_types_sysdeps [];
+extern const unsigned glibtop_types_sysdeps [];
 extern const char *glibtop_labels_sysdeps [];
 extern const char *glibtop_descriptions_sysdeps [];
 
diff --git a/sysdeps/guile/names/cpu.c b/sysdeps/guile/names/cpu.c
index e7b533b6..eed68f17 100644
--- a/sysdeps/guile/names/cpu.c
+++ b/sysdeps/guile/names/cpu.c
@@ -52,7 +52,7 @@ glibtop_guile_types_cpu (void)
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_cpu [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_cpu [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/loadavg.c b/sysdeps/guile/names/loadavg.c
index e82c8e9b..c6e37127 100644
--- a/sysdeps/guile/names/loadavg.c
+++ b/sysdeps/guile/names/loadavg.c
@@ -52,7 +52,7 @@ glibtop_guile_types_loadavg (void)
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_loadavg [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_loadavg [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/mem.c b/sysdeps/guile/names/mem.c
index 53662e1e..06160766 100644
--- a/sysdeps/guile/names/mem.c
+++ b/sysdeps/guile/names/mem.c
@@ -52,7 +52,7 @@ glibtop_guile_types_mem (void)
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_mem [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_mem [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/msg_limits.c b/sysdeps/guile/names/msg_limits.c
index 60b23ee7..9225c9af 100644
--- a/sysdeps/guile/names/msg_limits.c
+++ b/sysdeps/guile/names/msg_limits.c
@@ -52,7 +52,7 @@ glibtop_guile_types_msg_limits (void)
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_msg_limits [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_msg_limits [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/prockernel.c b/sysdeps/guile/names/prockernel.c
index 436e6d23..1fbd0e95 100644
--- a/sysdeps/guile/names/prockernel.c
+++ b/sysdeps/guile/names/prockernel.c
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_kernel (void)
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_proc_kernel [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_proc_kernel [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/proclist.c b/sysdeps/guile/names/proclist.c
index 764483b3..2dc568cc 100644
--- a/sysdeps/guile/names/proclist.c
+++ b/sysdeps/guile/names/proclist.c
@@ -53,7 +53,7 @@ glibtop_guile_types_proclist (void)
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_proclist [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_proclist [i])),
 				  SCM_UNDEFINED));
 			 
 	return list;
diff --git a/sysdeps/guile/names/procmem.c b/sysdeps/guile/names/procmem.c
index cbd58a19..a114a530 100644
--- a/sysdeps/guile/names/procmem.c
+++ b/sysdeps/guile/names/procmem.c
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_mem (void)
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_proc_mem [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_proc_mem [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/procsegment.c b/sysdeps/guile/names/procsegment.c
index a872bcd1..926ae65f 100644
--- a/sysdeps/guile/names/procsegment.c
+++ b/sysdeps/guile/names/procsegment.c
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_segment (void)
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_proc_segment [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_proc_segment [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/procsignal.c b/sysdeps/guile/names/procsignal.c
index 18c16271..e3c8da87 100644
--- a/sysdeps/guile/names/procsignal.c
+++ b/sysdeps/guile/names/procsignal.c
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_signal (void)
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_proc_signal [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_proc_signal [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/procstate.c b/sysdeps/guile/names/procstate.c
index ca10c102..8575fc69 100644
--- a/sysdeps/guile/names/procstate.c
+++ b/sysdeps/guile/names/procstate.c
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_state (void)
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_proc_state [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_proc_state [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/proctime.c b/sysdeps/guile/names/proctime.c
index 4797d4ab..67cbd924 100644
--- a/sysdeps/guile/names/proctime.c
+++ b/sysdeps/guile/names/proctime.c
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_time (void)
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_proc_time [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_proc_time [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/procuid.c b/sysdeps/guile/names/procuid.c
index 96022765..b47eb226 100644
--- a/sysdeps/guile/names/procuid.c
+++ b/sysdeps/guile/names/procuid.c
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_uid (void)
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
 		list = gh_append
 			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_types_proc_uid [i])),
+				  gh_list (gh_ulong2scm (glibtop_types_proc_uid [i])),
 				  SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/sem_limits.c b/sysdeps/guile/names/sem_limits.c
index 23b7a252..6c88555c 100644
--- a/sysdeps/guile/names/sem_limits.c
+++ b/sysdeps/guile/names/sem_limits.c
@@ -50,7 +50,7 @@ glibtop_guile_types_sem_limits (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
 		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_types_sem_limits [i]))),
+					   gh_list (gh_ulong2scm (glibtop_types_sem_limits [i])),
 					   SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/shm_limits.c b/sysdeps/guile/names/shm_limits.c
index c81a1b42..50c7c0d8 100644
--- a/sysdeps/guile/names/shm_limits.c
+++ b/sysdeps/guile/names/shm_limits.c
@@ -50,7 +50,7 @@ glibtop_guile_types_shm_limits (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
 		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_types_shm_limits [i]))),
+					   gh_list (gh_ulong2scm (glibtop_types_shm_limits [i])),
 					   SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/swap.c b/sysdeps/guile/names/swap.c
index 21195a8f..720d6371 100644
--- a/sysdeps/guile/names/swap.c
+++ b/sysdeps/guile/names/swap.c
@@ -50,7 +50,7 @@ glibtop_guile_types_swap (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
 		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_types_swap [i]))),
+					   gh_list (gh_ulong2scm (glibtop_types_swap [i])),
 					   SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/sysdeps.c b/sysdeps/guile/names/sysdeps.c
index 390be91f..d9ed5af5 100644
--- a/sysdeps/guile/names/sysdeps.c
+++ b/sysdeps/guile/names/sysdeps.c
@@ -50,7 +50,7 @@ glibtop_guile_types_sysdeps (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
 		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_types_sysdeps [i]))),
+					   gh_list (gh_ulong2scm (glibtop_types_sysdeps [i])),
 					   SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/guile/names/uptime.c b/sysdeps/guile/names/uptime.c
index 3776363b..eb708aff 100644
--- a/sysdeps/guile/names/uptime.c
+++ b/sysdeps/guile/names/uptime.c
@@ -50,7 +50,7 @@ glibtop_guile_types_uptime (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
 		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_types_uptime [i]))),
+					   gh_list (gh_ulong2scm (glibtop_types_uptime [i])),
 					   SCM_UNDEFINED));
 	
 	return list;
diff --git a/sysdeps/names/sysdeps.c b/sysdeps/names/sysdeps.c
index 3387efd0..cfd672b3 100644
--- a/sysdeps/names/sysdeps.c
+++ b/sysdeps/names/sysdeps.c
@@ -23,22 +23,25 @@
 
 const char *glibtop_names_sysdeps [GLIBTOP_MAX_SYSDEPS] =
 {
-	"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"
+	"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"
 };
 
-const char *glibtop_types_sysdeps [GLIBTOP_MAX_SYSDEPS] =
+const unsigned glibtop_types_sysdeps [GLIBTOP_MAX_SYSDEPS] =
 {
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long",
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long",
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long",
-	"unsigned long", "unsigned long", "unsigned long", "unsigned long"
+	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] =
 {
+	N_("Server Features"),
 	N_("CPU Usage"),
 	N_("Memory Usage"),
 	N_("Swap Usage"),
@@ -59,6 +62,7 @@ const char *glibtop_labels_sysdeps [GLIBTOP_MAX_SYSDEPS] =
 
 const char *glibtop_descriptions_sysdeps [GLIBTOP_MAX_SYSDEPS] =
 {
+	N_("Server Features"),
 	N_("CPU Usage"),
 	N_("Memory Usage"),
 	N_("Swap Usage"),