From a9bb70c52fa79ba2e7c8f440547fa19e12ba0186 Mon Sep 17 00:00:00 2001 From: ivmai Date: Sun, 20 Sep 2009 08:07:27 +0000 Subject: [PATCH] 2009-09-20 Ivan Maidanski * allchblk.c (GC_freehblk): Adjust local variables indentation. * mallocx.c (GC_generic_malloc_many): Ditto. * typd_mlc.c (GC_malloc_explicitly_typed_ignore_off_page, GC_calloc_explicitly_typed): Ditto. * typd_mlc.c (GC_make_array_descriptor): Remove unnecessary brackets. --- ChangeLog | 10 ++++++++++ allchblk.c | 7 +++---- mallocx.c | 16 ++++++++-------- typd_mlc.c | 35 +++++++++++++++++------------------ 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5c78d0e..d91930a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ + +2009-09-20 Ivan Maidanski + + * allchblk.c (GC_freehblk): Adjust local variables indentation. + * mallocx.c (GC_generic_malloc_many): Ditto. + * typd_mlc.c (GC_malloc_explicitly_typed_ignore_off_page, + GC_calloc_explicitly_typed): Ditto. + * typd_mlc.c (GC_make_array_descriptor): Remove unnecessary + brackets. + 2009-09-20 Ivan Maidanski * configure.ac: Replace GC_WIN32_THREADS with GC_THREADS. diff --git a/allchblk.c b/allchblk.c index 713e4ae6..b2a5ea73 100644 --- a/allchblk.c +++ b/allchblk.c @@ -821,10 +821,9 @@ GC_allochblk_nth(size_t sz, int kind, unsigned flags, int n, GC_bool may_split) void GC_freehblk(struct hblk *hbp) { -struct hblk *next, *prev; -hdr *hhdr, *prevhdr, *nexthdr; -signed_word size; - + struct hblk *next, *prev; + hdr *hhdr, *prevhdr, *nexthdr; + signed_word size; GET_HDR(hbp, hhdr); size = hhdr->hb_sz; diff --git a/mallocx.c b/mallocx.c index 841a0e20..e0cb011d 100644 --- a/mallocx.c +++ b/mallocx.c @@ -267,14 +267,14 @@ volatile signed_word GC_bytes_allocd_tmp = 0; /* Note that the client should usually clear the link field. */ void GC_generic_malloc_many(size_t lb, int k, void **result) { -void *op; -void *p; -void **opp; -size_t lw; /* Length in words. */ -size_t lg; /* Length in granules. */ -signed_word my_bytes_allocd = 0; -struct obj_kind * ok = &(GC_obj_kinds[k]); -DCL_LOCK_STATE; + void *op; + void *p; + void **opp; + size_t lw; /* Length in words. */ + size_t lg; /* Length in granules. */ + signed_word my_bytes_allocd = 0; + struct obj_kind * ok = &(GC_obj_kinds[k]); + DCL_LOCK_STATE; GC_ASSERT(lb != 0 && (lb & (GRANULE_BYTES-1)) == 0); if (!SMALL_OBJ(lb)) { diff --git a/typd_mlc.c b/typd_mlc.c index 6e29975a..9530aafe 100644 --- a/typd_mlc.c +++ b/typd_mlc.c @@ -289,12 +289,11 @@ STATIC int GC_make_array_descriptor(size_t nelements, size_t size, return(COMPLEX); } } - { - leaf -> ld_size = size; - leaf -> ld_nelements = nelements; - leaf -> ld_descriptor = descriptor; - return(LEAF); - } + + leaf -> ld_size = size; + leaf -> ld_nelements = nelements; + leaf -> ld_descriptor = descriptor; + return(LEAF); } STATIC complex_descriptor * @@ -623,10 +622,10 @@ GC_API void * GC_CALL GC_malloc_explicitly_typed(size_t lb, GC_descr d) GC_API void * GC_CALL GC_malloc_explicitly_typed_ignore_off_page(size_t lb, GC_descr d) { -ptr_t op; -ptr_t * opp; -size_t lg; -DCL_LOCK_STATE; + ptr_t op; + ptr_t * opp; + size_t lg; + DCL_LOCK_STATE; lb += TYPD_EXTRA_BYTES; if( SMALL_OBJ(lb) ) { @@ -658,14 +657,14 @@ DCL_LOCK_STATE; GC_API void * GC_CALL GC_calloc_explicitly_typed(size_t n, size_t lb, GC_descr d) { -ptr_t op; -ptr_t * opp; -size_t lg; -GC_descr simple_descr; -complex_descriptor *complex_descr; -register int descr_type; -struct LeafDescriptor leaf; -DCL_LOCK_STATE; + ptr_t op; + ptr_t * opp; + size_t lg; + GC_descr simple_descr; + complex_descriptor *complex_descr; + register int descr_type; + struct LeafDescriptor leaf; + DCL_LOCK_STATE; descr_type = GC_make_array_descriptor((word)n, (word)lb, d, &simple_descr, &complex_descr, &leaf); -- 2.49.0