Replaced call to `gh_append2 ()' with `gh_append ()'.

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

	* sysdeps/guile/proclist.c: Replaced call to
	`gh_append2 ()' with `gh_append ()'.

18 files changed, 219 insertions, 127 deletions

diff --git a/ChangeLog b/ChangeLog
index 656a795e..23707b16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-06-12  Martin Baulig  <baulig@taurus.uni-trier.de>
+
+	* sysdeps/guile/proclist.c: Replaced call to
+	`gh_append2 ()' with `gh_append ()'.
+
+	* sysdeps/guile/names/*.c: dito.
+
 1998-06-05  Martin Baulig  <baulig@taurus.uni-trier.de>
 
 	* support: removed that directory.
diff --git a/sysdeps/guile/names/cpu.c b/sysdeps/guile/names/cpu.c
index ac08cb56..94cb4056 100644
--- a/sysdeps/guile/names/cpu.c
+++ b/sysdeps/guile/names/cpu.c
@@ -33,10 +33,11 @@ glibtop_guile_names_cpu (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_cpu [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_cpu (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_cpu [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_cpu (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_cpu [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_cpu (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_cpu [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/loadavg.c b/sysdeps/guile/names/loadavg.c
index fe4b589d..c12254b4 100644
--- a/sysdeps/guile/names/loadavg.c
+++ b/sysdeps/guile/names/loadavg.c
@@ -33,10 +33,11 @@ glibtop_guile_names_loadavg (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_loadavg [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_loadavg (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_loadavg [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_loadavg (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_loadavg [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_loadavg (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_loadavg [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/mem.c b/sysdeps/guile/names/mem.c
index afc4e7a9..fe2582e5 100644
--- a/sysdeps/guile/names/mem.c
+++ b/sysdeps/guile/names/mem.c
@@ -33,10 +33,11 @@ glibtop_guile_names_mem (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_mem [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_mem (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_mem [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_mem (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_mem [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_mem (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_mem [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/msg_limits.c b/sysdeps/guile/names/msg_limits.c
index f978eabc..4e7afc4f 100644
--- a/sysdeps/guile/names/msg_limits.c
+++ b/sysdeps/guile/names/msg_limits.c
@@ -33,10 +33,11 @@ glibtop_guile_names_msg_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_msg_limits [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_msg_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_msg_limits [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_msg_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_msg_limits [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_msg_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_msg_limits [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/prockernel.c b/sysdeps/guile/names/prockernel.c
index 0de1d334..31e7b13b 100644
--- a/sysdeps/guile/names/prockernel.c
+++ b/sysdeps/guile/names/prockernel.c
@@ -33,10 +33,11 @@ glibtop_guile_names_proc_kernel (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_proc_kernel [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_proc_kernel (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_proc_kernel [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_proc_kernel (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_proc_kernel [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_proc_kernel (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_proc_kernel [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/proclist.c b/sysdeps/guile/names/proclist.c
index 7269d085..fb129e97 100644
--- a/sysdeps/guile/names/proclist.c
+++ b/sysdeps/guile/names/proclist.c
@@ -34,10 +34,11 @@ glibtop_guile_names_proclist (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_proclist [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -51,10 +52,11 @@ glibtop_guile_types_proclist (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_proclist [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -68,11 +70,12 @@ glibtop_guile_labels_proclist (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_proclist [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -86,11 +89,12 @@ glibtop_guile_descriptions_proclist (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_proclist [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procmem.c b/sysdeps/guile/names/procmem.c
index 4daf9967..58101900 100644
--- a/sysdeps/guile/names/procmem.c
+++ b/sysdeps/guile/names/procmem.c
@@ -33,10 +33,11 @@ glibtop_guile_names_proc_mem (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_proc_mem [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_proc_mem (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_proc_mem [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_proc_mem (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_proc_mem [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_proc_mem (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_proc_mem [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procsegment.c b/sysdeps/guile/names/procsegment.c
index 7ed42171..5ab51c56 100644
--- a/sysdeps/guile/names/procsegment.c
+++ b/sysdeps/guile/names/procsegment.c
@@ -33,10 +33,11 @@ glibtop_guile_names_proc_segment (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_proc_segment [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_proc_segment (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_proc_segment [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_proc_segment (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_proc_segment [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_proc_segment (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_proc_segment [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procsignal.c b/sysdeps/guile/names/procsignal.c
index 97df5373..f614992d 100644
--- a/sysdeps/guile/names/procsignal.c
+++ b/sysdeps/guile/names/procsignal.c
@@ -33,10 +33,11 @@ glibtop_guile_names_proc_signal (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_proc_signal [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_proc_signal (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_proc_signal [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_proc_signal (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_proc_signal [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_proc_signal (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_proc_signal [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procstate.c b/sysdeps/guile/names/procstate.c
index 7ba88645..9b1a1e16 100644
--- a/sysdeps/guile/names/procstate.c
+++ b/sysdeps/guile/names/procstate.c
@@ -33,10 +33,11 @@ glibtop_guile_names_proc_state (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_proc_state [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_proc_state (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_proc_state [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_proc_state (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_proc_state [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_proc_state (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_proc_state [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/proctime.c b/sysdeps/guile/names/proctime.c
index b0ad5e60..fb0d194c 100644
--- a/sysdeps/guile/names/proctime.c
+++ b/sysdeps/guile/names/proctime.c
@@ -33,10 +33,11 @@ glibtop_guile_names_proc_time (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_proc_time [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_proc_time (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_append2
+		list = gh_appen
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_proc_time [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_proc_time (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_append2
+		list = gh_appen
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_proc_time [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_proc_time (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_append2
+		list = gh_appen
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_proc_time [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procuid.c b/sysdeps/guile/names/procuid.c
index 0746f8a8..32170788 100644
--- a/sysdeps/guile/names/procuid.c
+++ b/sysdeps/guile/names/procuid.c
@@ -33,10 +33,11 @@ glibtop_guile_names_proc_uid (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_names_proc_uid [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -50,10 +51,11 @@ glibtop_guile_types_proc_uid (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (glibtop_types_proc_uid [i]),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -67,11 +69,12 @@ glibtop_guile_labels_proc_uid (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_labels_proc_uid [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
@@ -85,11 +88,12 @@ glibtop_guile_descriptions_proc_uid (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
-		list = gh_append2
+		list = gh_append
 			(list, gh_list
 			 (gh_str02scm (gettext
 				       (glibtop_descriptions_proc_uid [i])),
-			  SCM_UNDEFINED));
+			  SCM_UNDEFINED),
+			 SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/sem_limits.c b/sysdeps/guile/names/sem_limits.c
index 397ddebd..46bdeb94 100644
--- a/sysdeps/guile/names/sem_limits.c
+++ b/sysdeps/guile/names/sem_limits.c
@@ -33,8 +33,10 @@ glibtop_guile_names_sem_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (glibtop_names_sem_limits [i]),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (glibtop_names_sem_limits [i]),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -48,8 +50,10 @@ glibtop_guile_types_sem_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_types_sem_limits [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_types_sem_limits [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -63,8 +67,10 @@ glibtop_guile_labels_sem_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_labels_sem_limits [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_labels_sem_limits [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -78,8 +84,10 @@ glibtop_guile_descriptions_sem_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_descriptions_sem_limits [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_descriptions_sem_limits [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/shm_limits.c b/sysdeps/guile/names/shm_limits.c
index 32ea693b..6987ad5d 100644
--- a/sysdeps/guile/names/shm_limits.c
+++ b/sysdeps/guile/names/shm_limits.c
@@ -33,8 +33,10 @@ glibtop_guile_names_shm_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (glibtop_names_shm_limits [i]),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (glibtop_names_shm_limits [i]),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -48,8 +50,10 @@ glibtop_guile_types_shm_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_types_shm_limits [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_types_shm_limits [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -63,8 +67,10 @@ glibtop_guile_labels_shm_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_labels_shm_limits [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_labels_shm_limits [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -78,8 +84,10 @@ glibtop_guile_descriptions_shm_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_descriptions_shm_limits [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_descriptions_shm_limits [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/swap.c b/sysdeps/guile/names/swap.c
index e5d477d4..7e04d533 100644
--- a/sysdeps/guile/names/swap.c
+++ b/sysdeps/guile/names/swap.c
@@ -33,7 +33,10 @@ glibtop_guile_names_swap (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (glibtop_names_swap [i]), SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (glibtop_names_swap [i]),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -47,8 +50,10 @@ glibtop_guile_types_swap (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_types_swap [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_types_swap [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -62,8 +67,10 @@ glibtop_guile_labels_swap (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_labels_swap [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_labels_swap [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -77,8 +84,10 @@ glibtop_guile_descriptions_swap (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_descriptions_swap [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_descriptions_swap [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/uptime.c b/sysdeps/guile/names/uptime.c
index 6bf65203..a5d6a2bf 100644
--- a/sysdeps/guile/names/uptime.c
+++ b/sysdeps/guile/names/uptime.c
@@ -33,7 +33,10 @@ glibtop_guile_names_uptime (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (glibtop_names_uptime [i]), SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (glibtop_names_uptime [i]),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -47,8 +50,10 @@ glibtop_guile_types_uptime (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_types_uptime [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_types_uptime [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -62,8 +67,10 @@ glibtop_guile_labels_uptime (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_labels_uptime [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_labels_uptime [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
@@ -77,8 +84,10 @@ glibtop_guile_descriptions_uptime (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_descriptions_uptime [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (list, gh_list
+				  (gh_str02scm (gettext (glibtop_descriptions_uptime [i])),
+				   SCM_UNDEFINED),
+				  SCM_UNDEFINED);
 	
 	return list;
 }
diff --git a/sysdeps/guile/proclist.c b/sysdeps/guile/proclist.c
index 50fa0b0c..6eea127b 100644
--- a/sysdeps/guile/proclist.c
+++ b/sysdeps/guile/proclist.c
@@ -43,7 +43,10 @@ glibtop_guile_get_proclist (void)
 
 	if (ptr) {
 		for (i = 0; i < proclist.number; i++)
-			list = gh_append2 (list, gh_list (gh_ulong2scm ((unsigned long) ptr [i]), SCM_UNDEFINED));
+			list = gh_append (list,
+					  gh_list (gh_ulong2scm ((unsigned long) ptr [i]),
+						   SCM_UNDEFINED),
+					  SCM_UNDEFINED);
 	}
 
 	glibtop_free (ptr);