mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00
Code Activity

Fix C99-style declarations after statements.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2009-11-17 01:26:25 +01:00
parent 6bd210e090
commit 7f991c7d32
6 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/eval.i.c
View file

@ -883,9 +883,11 @@ dispatch:
#ifdef DEVAL #ifdef DEVAL
if (scm_check_memoize_p && SCM_TRAPS_P) if (scm_check_memoize_p && SCM_TRAPS_P)
{ {
SCM arg1, retval;
SCM_CLEAR_TRACED_FRAME (debug); SCM_CLEAR_TRACED_FRAME (debug);
SCM arg1 = scm_make_debugobj (&debug); arg1 = scm_make_debugobj (&debug);
SCM retval = SCM_BOOL_T; retval = SCM_BOOL_T;
SCM_TRAPS_P = 0; SCM_TRAPS_P = 0;
retval = scm_call_4 (SCM_MEMOIZE_HDLR, retval = scm_call_4 (SCM_MEMOIZE_HDLR,
scm_sym_memoize_symbol, scm_sym_memoize_symbol,

4
libguile/read.c
View file

@ -1088,8 +1088,10 @@ scm_read_extended_symbol (scm_t_wchar chr, SCM port)
if (len >= scm_i_string_length (buf) - 2) if (len >= scm_i_string_length (buf) - 2)
{ {
SCM addy;
scm_i_string_stop_writing (); 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)); buf = scm_string_append (scm_list_2 (buf, addy));
len = 0; len = 0;
buf = scm_i_string_start_writing (buf); buf = scm_i_string_start_writing (buf);

3
libguile/struct.c
View file

@ -63,9 +63,10 @@ SCM_DEFINE (scm_make_struct_layout, "make-struct-layout", 1, 0, 0,
#define FUNC_NAME s_scm_make_struct_layout #define FUNC_NAME s_scm_make_struct_layout
{ {
SCM new_sym; SCM new_sym;
SCM_VALIDATE_STRING (1, fields);
scm_t_wchar c; scm_t_wchar c;
SCM_VALIDATE_STRING (1, fields);
{ /* scope */ { /* scope */
size_t len; size_t len;
int x; int x;

3
libguile/threads.c
View file

@ -1373,6 +1373,7 @@ static int
fat_mutex_unlock (SCM mutex, SCM cond, fat_mutex_unlock (SCM mutex, SCM cond,
const scm_t_timespec *waittime, int relock) const scm_t_timespec *waittime, int relock)
{ {
SCM owner;
fat_mutex *m = SCM_MUTEX_DATA (mutex); fat_mutex *m = SCM_MUTEX_DATA (mutex);
fat_cond *c = NULL; fat_cond *c = NULL;
scm_i_thread *t = SCM_I_CURRENT_THREAD; 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_i_scm_pthread_mutex_lock (&m->lock);
SCM owner = m->owner; owner = m->owner;
if (!scm_is_eq (owner, scm_current_thread ())) if (!scm_is_eq (owner, scm_current_thread ()))
{ {

4
libguile/vm-i-system.c
View file

@ -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) VM_DEFINE_INSTRUCTION (41, br_if_nargs_ne, "br-if-nargs-ne", 5, 0, 0)
{ {
scm_t_ptrdiff n; scm_t_ptrdiff n;
scm_t_int32 offset;
n = FETCH () << 8; n = FETCH () << 8;
n += FETCH (); n += FETCH ();
scm_t_int32 offset;
FETCH_OFFSET (offset); FETCH_OFFSET (offset);
if (sp - (fp - 1) != n) if (sp - (fp - 1) != n)
ip += offset; 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) VM_DEFINE_INSTRUCTION (42, br_if_nargs_lt, "br-if-nargs-lt", 5, 0, 0)
{ {
scm_t_ptrdiff n; scm_t_ptrdiff n;
scm_t_int32 offset;
n = FETCH () << 8; n = FETCH () << 8;
n += FETCH (); n += FETCH ();
scm_t_int32 offset;
FETCH_OFFSET (offset); FETCH_OFFSET (offset);
if (sp - (fp - 1) < n) if (sp - (fp - 1) < n)
ip += offset; ip += offset;

3
libguile/vm.c
View file

@ -298,11 +298,12 @@ make_vm (void)
#define FUNC_NAME "make_vm" #define FUNC_NAME "make_vm"
{ {
int i; int i;
struct scm_vm *vp;
if (!scm_tc16_vm) if (!scm_tc16_vm)
return SCM_BOOL_F; /* not booted yet */ 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; vp->stack_size = VM_DEFAULT_STACK_SIZE;