ruby-changes:13054
From: nobu <ko1@a...>
Date: Wed, 9 Sep 2009 11:11:56 +0900 (JST)
Subject: [ruby-changes:13054] Ruby:r24801 (trunk): * include/ruby/ruby.h (rb_data_type_struct): constified dsize.
nobu 2009-09-09 11:11:35 +0900 (Wed, 09 Sep 2009) New Revision: 24801 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24801 Log: * include/ruby/ruby.h (rb_data_type_struct): constified dsize. Modified files: trunk/ChangeLog trunk/encoding.c trunk/include/ruby/ruby.h trunk/iseq.c trunk/parse.y trunk/proc.c trunk/random.c trunk/vm.c Index: encoding.c =================================================================== --- encoding.c (revision 24800) +++ encoding.c (revision 24801) @@ -53,7 +53,7 @@ static int load_encoding(const char *name); static size_t -enc_memsize(void *p) +enc_memsize(const void *p) { return 0; } Index: include/ruby/ruby.h =================================================================== --- include/ruby/ruby.h (revision 24800) +++ include/ruby/ruby.h (revision 24801) @@ -740,7 +740,7 @@ const char *wrap_struct_name; void (*dmark)(void*); void (*dfree)(void*); - size_t (*dsize)(void *); + size_t (*dsize)(const void *); void *ary[4]; /* for extension */ } rb_data_type_t; Index: ChangeLog =================================================================== --- ChangeLog (revision 24800) +++ ChangeLog (revision 24801) @@ -1,3 +1,7 @@ +Wed Sep 9 11:11:33 2009 Nobuyoshi Nakada <nobu@r...> + + * include/ruby/ruby.h (rb_data_type_struct): constified dsize. + Wed Sep 9 11:07:48 2009 Nobuyoshi Nakada <nobu@r...> * cont.c (cont_memsize): fixed wrong expression on IA64. Index: iseq.c =================================================================== --- iseq.c (revision 24800) +++ iseq.c (revision 24801) @@ -116,10 +116,10 @@ } static size_t -iseq_memsize(void *ptr) +iseq_memsize(const void *ptr) { size_t size = sizeof(rb_iseq_t); - rb_iseq_t *iseq; + const rb_iseq_t *iseq; if (ptr) { iseq = ptr; Index: proc.c =================================================================== --- proc.c (revision 24800) +++ proc.c (revision 24801) @@ -62,7 +62,7 @@ } static size_t -proc_memsize(void *ptr) +proc_memsize(const void *ptr) { return ptr ? sizeof(rb_proc_t) : 0; } @@ -255,7 +255,7 @@ } static size_t -binding_memsize(void *ptr) +binding_memsize(const void *ptr) { return ptr ? sizeof(rb_binding_t) : 0; } @@ -859,7 +859,7 @@ } static size_t -bm_memsize(void *ptr) +bm_memsize(const void *ptr) { return ptr ? sizeof(struct METHOD) : 0; } Index: parse.y =================================================================== --- parse.y (revision 24800) +++ parse.y (revision 24801) @@ -9745,7 +9745,7 @@ } static size_t -parser_memsize(void *ptr) +parser_memsize(const void *ptr) { struct parser_params *p = (struct parser_params*)ptr; struct local_vars *local; Index: vm.c =================================================================== --- vm.c (revision 24800) +++ vm.c (revision 24801) @@ -225,7 +225,7 @@ } static size_t -env_memsize(void *ptr) +env_memsize(const void *ptr) { if (ptr) { const rb_env_t * const env = ptr; @@ -1482,10 +1482,10 @@ } static size_t -vm_memsize(void *ptr) +vm_memsize(const void *ptr) { if (ptr) { - rb_vm_t *vmobj = ptr; + const rb_vm_t *vmobj = ptr; return sizeof(rb_vm_t) + st_memsize(vmobj->living_threads); } else { @@ -1658,12 +1658,12 @@ } static size_t -thread_memsize(void *ptr) +thread_memsize(const void *ptr) { RUBY_FREE_ENTER("thread"); if (ptr) { - rb_thread_t *th = ptr; + const rb_thread_t *th = ptr; size_t size = sizeof(rb_thread_t); if (!th->root_fiber) { Index: random.c =================================================================== --- random.c (revision 24800) +++ random.c (revision 24801) @@ -315,7 +315,7 @@ #define random_free RUBY_TYPED_DEFAULT_FREE static size_t -random_memsize(void *ptr) +random_memsize(const void *ptr) { return ptr ? sizeof(rb_random_t) : 0; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/