further boot cleanups

* libguile/srfi-14.c (define_charset):
* libguile/deprecated.c (scm_create_hook): Don't bother making the
  returned objects (hooks or charsets) into permanent objects; they are
  already defined, and then the caller probably stores them away too.

* libguile/init.c (scm_i_init_guile): Add a couple annotations.

diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index 6025c7b..ac10c7a 100644 (file)
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -423,7 +423,7 @@ scm_create_hook (const char *name, int n_args)
   {
     SCM hook = scm_make_hook (scm_from_int (n_args));
     scm_c_define (name, hook);
-    return scm_permanent_object (hook);
+    return hook;
   }
 }
 

diff --git a/libguile/init.c b/libguile/init.c
index c674b40..ccd91c1 100644 (file)
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -469,7 +469,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
   scm_init_fports ();
   scm_init_strports ();
   scm_init_ports ();
-  scm_init_gdbint ();           /* Requires strports */
+  scm_init_gdbint ();           /* Requires strports, gc_protect_object */
   scm_init_hash ();
   scm_init_hashtab ();
   scm_init_deprecation ();
@@ -516,7 +516,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
   scm_init_arrays ();
   scm_init_array_map ();
 
-  scm_bootstrap_vm ();
+  scm_bootstrap_vm ();  /* requires gc_permanent_object */
 
   scm_init_strings ();  /* Requires array-handle */
   scm_init_struct ();   /* Requires strings */

diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index 38ef320..09fe90c 100644 (file)
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -2010,7 +2010,7 @@ define_charset (const char *name, const scm_t_char_set *p)
 
   SCM_NEWSMOB (cs, scm_tc16_charset, p);
   scm_c_define (name, cs);
-  return scm_permanent_object (cs);
+  return cs;
 }
 
 SCM_DEFINE (scm_sys_char_set_dump, "%char-set-dump", 1, 0, 0, (SCM charset),