diff options
author | Neil Jerram <neil@ossau.uklinux.net> | 2005-05-11 07:41:36 +0000 |
---|---|---|
committer | Neil Jerram <neil@ossau.uklinux.net> | 2005-05-11 07:41:36 +0000 |
commit | b01532af77392c508b6850304bfefde4f7d23b7e (patch) | |
tree | f80f68e53a024add6664213860e8603a3273471b | |
parent | 229a07109cd417426931ab4b3c91930577db4809 (diff) | |
download | guile-b01532af77392c508b6850304bfefde4f7d23b7e.tar.gz |
* threads.c (s_scm_lock_mutex): Don't declare msg in middle of
code.
* gc.c (s_scm_gc_live_object_stats): Don't declare alist in middle
of code.
* gc-card.c (scm_i_card_statistics): Don't declare tag in middle
of code.
(scm_i_card_statistics): Add block for declarations of tag_as_scm
and current.
-rw-r--r-- | libguile/ChangeLog | 15 | ||||
-rw-r--r-- | libguile/gc-card.c | 16 | ||||
-rw-r--r-- | libguile/gc.c | 4 | ||||
-rw-r--r-- | libguile/threads.c | 2 |
4 files changed, 29 insertions, 8 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 62b607359..ce59435c4 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,18 @@ +2005-05-11 Neil Jerram <neil@ossau.uklinux.net> + + Fix C99isms reported by Ludovic Courtès: + + * threads.c (s_scm_lock_mutex): Don't declare msg in middle of + code. + + * gc.c (s_scm_gc_live_object_stats): Don't declare alist in middle + of code. + + * gc-card.c (scm_i_card_statistics): Don't declare tag in middle + of code. + (scm_i_card_statistics): Add block for declarations of tag_as_scm + and current. + 2005-05-10 Neil Jerram <neil@ossau.uklinux.net> * scmsigs.c (signal_delivery_thread): Return a value, to avoid diff --git a/libguile/gc-card.c b/libguile/gc-card.c index 3fe6e3c40..8e772043b 100644 --- a/libguile/gc-card.c +++ b/libguile/gc-card.c @@ -308,11 +308,13 @@ scm_i_card_statistics (scm_t_cell *p, SCM hashtab, scm_t_heap_segment *seg) for (p += offset; p < end; p += span, offset += span) { + scm_t_bits tag; SCM scmptr = PTR2SCM (p); + if (!SCM_C_BVEC_GET (bitvec, offset)) continue; - scm_t_bits tag = SCM_TYP7 (scmptr); + tag = SCM_TYP7 (scmptr); if (tag == scm_tc7_smob) { tag = SCM_TYP16(scmptr); @@ -337,12 +339,14 @@ scm_i_card_statistics (scm_t_cell *p, SCM hashtab, scm_t_heap_segment *seg) tag = scm_tc7_asubr; break; } - - SCM tag_as_scm = scm_from_int (tag); - SCM current = scm_hashq_ref (hashtab, tag_as_scm, SCM_I_MAKINUM (0)); - scm_hashq_set_x (hashtab, tag_as_scm, - scm_from_int (scm_to_int (current) + 1)); + { + SCM tag_as_scm = scm_from_int (tag); + SCM current = scm_hashq_ref (hashtab, tag_as_scm, SCM_I_MAKINUM (0)); + + scm_hashq_set_x (hashtab, tag_as_scm, + scm_from_int (scm_to_int (current) + 1)); + } } } diff --git a/libguile/gc.c b/libguile/gc.c index 81d873edd..9e46e4128 100644 --- a/libguile/gc.c +++ b/libguile/gc.c @@ -277,9 +277,11 @@ SCM_DEFINE (scm_gc_live_object_stats, "gc-live-object-stats", 0, 0, 0, #define FUNC_NAME s_scm_gc_live_object_stats { SCM tab = scm_make_hash_table (scm_from_int (57)); + SCM alist; + scm_i_all_segments_statistics (tab); - SCM alist + alist = scm_internal_hash_fold (&tag_table_to_type_alist, NULL, SCM_EOL, tab); return alist; diff --git a/libguile/threads.c b/libguile/threads.c index a9e5df1ec..89ada733b 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -883,9 +883,9 @@ SCM_DEFINE (scm_lock_mutex, "lock-mutex", 1, 0, 0, "thread. That is, Guile's mutexes are @emph{recursive}. ") #define FUNC_NAME s_scm_lock_mutex { - SCM_VALIDATE_MUTEX (1, mx); char *msg; + SCM_VALIDATE_MUTEX (1, mx); msg = fat_mutex_lock (mx); if (msg) scm_misc_error (NULL, msg, SCM_EOL); |