kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/dl/dl.c (rb_ary_to_ptr), ext/dl/ptr.c (rb_dlmem_delete):

Browse source 
suppress warnings.

* ext/dl/ptr.c (rb_dlptr_inspect), ext/dl/sym.c (rb_dlsym_inspect):
  use %p conversion.

* ext/dl/sym.c (rb_dlsym_guardcall): prevent guard from optimization.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-07-23 09:03:33 +00:00
parent 99bcfc9cce
commit a1d7f73998
4 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,4 +1,12 @@
Wed Jul 23 17:51:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jul 23 18:03:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/dl.c (rb_ary_to_ptr), ext/dl/ptr.c (rb_dlmem_delete):
suppress warnings.
* ext/dl/ptr.c (rb_dlptr_inspect), ext/dl/sym.c (rb_dlsym_inspect):
use %p conversion.
* ext/dl/sym.c (rb_dlsym_guardcall): prevent guard from optimization.
* ext/nkf/nkf-utf8/nkf.c (options): operators without any effect. * ext/nkf/nkf-utf8/nkf.c (options): operators without any effect.

2
ext/dl/dl.c
View file

@ -547,6 +547,8 @@ rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
case 0: case 0:
ptr = rb_ary2cary(0, self, &size); ptr = rb_ary2cary(0, self, &size);
break; break;
default:
return Qnil;
} }
if (ptr) { if (ptr) {
VALUE p = rb_dlptr_new(ptr, size, dlfree); VALUE p = rb_dlptr_new(ptr, size, dlfree);

5
ext/dl/ptr.c
View file

@ -18,8 +18,9 @@ static st_table* st_memory_table;
static void static void
rb_dlmem_delete(void *ptr) rb_dlmem_delete(void *ptr)
{ {
st_data_t data = (st_data_t)ptr;
rb_secure(4); rb_secure(4);
st_delete(st_memory_table, (st_data_t*)&ptr, NULL); st_delete(st_memory_table, &data, NULL);
} }
static void static void
@ -458,7 +459,7 @@ rb_dlptr_inspect(VALUE self)
char str[1024]; char str[1024];
Data_Get_Struct(self, struct ptr_data, data); Data_Get_Struct(self, struct ptr_data, data);
snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>", snprintf(str, 1023, "#<%s:%p ptr=%p size=%ld free=0x%lx>",
rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
(long)data->free); (long)data->free);
return rb_str_new2(str); return rb_str_new2(str);

3
ext/dl/sym.c
View file

@ -268,7 +268,7 @@ rb_dlsym_inspect(VALUE self)
str_size = RSTRING(proto)->len + 100; str_size = RSTRING(proto)->len + 100;
str = dlmalloc(str_size); str = dlmalloc(str_size);
snprintf(str, str_size - 1, snprintf(str, str_size - 1,
"#<DL::Symbol:0x%lx func=0x%lx '%s'>", "#<DL::Symbol:%p func=%p '%s'>",
sym, sym->func, RSTRING(proto)->ptr); sym, sym->func, RSTRING(proto)->ptr);
val = rb_tainted_str_new2(str); val = rb_tainted_str_new2(str);
dlfree(str); dlfree(str);
@ -430,6 +430,7 @@ rb_dlsym_guardcall(char type, ANY_TYPE *ret, long *stack, void *func)
default: default:
return 0; return 0;
} }
(void)guard;
return 1; return 1;
} }
# ifdef __MSVC_RUNTIME_CHECKS # ifdef __MSVC_RUNTIME_CHECKS