summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-11-17 01:26:25 +0100
committerLudovic Courtès <ludo@gnu.org>2009-11-17 23:13:58 +0100
commit7f991c7d322c9eaf83515de97b61700be8fa7abb (patch)
treea003b92d9b31e903066e057a5a24deaf1fa93a91
parent6bd210e090be6e6ce3fbe65075185676f87b1eac (diff)
downloadguile-7f991c7d322c9eaf83515de97b61700be8fa7abb.tar.gz
Fix C99-style declarations after statements.
* libguile/eval.i.c (ceval): Move declarations before statements. * libguile/read.c (scm_read_extended_symbol): Likewise. * libguile/struct.c (scm_make_struct_layout): Likewise. * libguile/threads.c (fat_mutex_unlock): Likewise. * libguile/vm-i-system.c (br_if_nargs_ne, br_if_nargs_lt): Likewise. * libguile/vm.c (make_vm): Likewise.
-rw-r--r--libguile/eval.i.c6
-rw-r--r--libguile/read.c4
-rw-r--r--libguile/struct.c3
-rw-r--r--libguile/threads.c3
-rw-r--r--libguile/vm-i-system.c4
-rw-r--r--libguile/vm.c3
6 files changed, 15 insertions, 8 deletions
diff --git a/libguile/eval.i.c b/libguile/eval.i.c
index ccb612611..afbe9219c 100644
--- a/libguile/eval.i.c
+++ b/libguile/eval.i.c
@@ -883,9 +883,11 @@ dispatch:
#ifdef DEVAL
if (scm_check_memoize_p && SCM_TRAPS_P)
{
+ SCM arg1, retval;
+
SCM_CLEAR_TRACED_FRAME (debug);
- SCM arg1 = scm_make_debugobj (&debug);
- SCM retval = SCM_BOOL_T;
+ arg1 = scm_make_debugobj (&debug);
+ retval = SCM_BOOL_T;
SCM_TRAPS_P = 0;
retval = scm_call_4 (SCM_MEMOIZE_HDLR,
scm_sym_memoize_symbol,
diff --git a/libguile/read.c b/libguile/read.c
index 775612a58..a81189f0b 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -1088,8 +1088,10 @@ scm_read_extended_symbol (scm_t_wchar chr, SCM port)
if (len >= scm_i_string_length (buf) - 2)
{
+ SCM addy;
+
scm_i_string_stop_writing ();
- SCM addy = scm_i_make_string (1024, NULL);
+ addy = scm_i_make_string (1024, NULL);
buf = scm_string_append (scm_list_2 (buf, addy));
len = 0;
buf = scm_i_string_start_writing (buf);
diff --git a/libguile/struct.c b/libguile/struct.c
index 33be8ad9b..f202d661e 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -63,9 +63,10 @@ SCM_DEFINE (scm_make_struct_layout, "make-struct-layout", 1, 0, 0,
#define FUNC_NAME s_scm_make_struct_layout
{
SCM new_sym;
- SCM_VALIDATE_STRING (1, fields);
scm_t_wchar c;
+ SCM_VALIDATE_STRING (1, fields);
+
{ /* scope */
size_t len;
int x;
diff --git a/libguile/threads.c b/libguile/threads.c
index 2ca4f15e9..82b39f82d 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1373,6 +1373,7 @@ static int
fat_mutex_unlock (SCM mutex, SCM cond,
const scm_t_timespec *waittime, int relock)
{
+ SCM owner;
fat_mutex *m = SCM_MUTEX_DATA (mutex);
fat_cond *c = NULL;
scm_i_thread *t = SCM_I_CURRENT_THREAD;
@@ -1380,7 +1381,7 @@ fat_mutex_unlock (SCM mutex, SCM cond,
scm_i_scm_pthread_mutex_lock (&m->lock);
- SCM owner = m->owner;
+ owner = m->owner;
if (!scm_is_eq (owner, scm_current_thread ()))
{
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 205771924..a85bd99ec 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -513,9 +513,9 @@ VM_DEFINE_INSTRUCTION (40, br_if_not_null, "br-if-not-null", 3, 0, 0)
VM_DEFINE_INSTRUCTION (41, br_if_nargs_ne, "br-if-nargs-ne", 5, 0, 0)
{
scm_t_ptrdiff n;
+ scm_t_int32 offset;
n = FETCH () << 8;
n += FETCH ();
- scm_t_int32 offset;
FETCH_OFFSET (offset);
if (sp - (fp - 1) != n)
ip += offset;
@@ -525,9 +525,9 @@ VM_DEFINE_INSTRUCTION (41, br_if_nargs_ne, "br-if-nargs-ne", 5, 0, 0)
VM_DEFINE_INSTRUCTION (42, br_if_nargs_lt, "br-if-nargs-lt", 5, 0, 0)
{
scm_t_ptrdiff n;
+ scm_t_int32 offset;
n = FETCH () << 8;
n += FETCH ();
- scm_t_int32 offset;
FETCH_OFFSET (offset);
if (sp - (fp - 1) < n)
ip += offset;
diff --git a/libguile/vm.c b/libguile/vm.c
index 1c5efd2cd..e37d25eed 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -298,11 +298,12 @@ make_vm (void)
#define FUNC_NAME "make_vm"
{
int i;
+ struct scm_vm *vp;
if (!scm_tc16_vm)
return SCM_BOOL_F; /* not booted yet */
- struct scm_vm *vp = scm_gc_malloc (sizeof (struct scm_vm), "vm");
+ vp = scm_gc_malloc (sizeof (struct scm_vm), "vm");
vp->stack_size = VM_DEFAULT_STACK_SIZE;