summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-07 21:37:27 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-07 21:37:27 +0000
commita56bd8c31aa536b122b07d7f7f04e427f3fc6a4e (patch)
treeba13f041ced0f2f38c63fa39926aa0f1374b849a
parent4319b48ab6aef267f1ff3e1e0a68b8d63a193765 (diff)
* ext/dl/cptr.c (rb_dlptr_inspect): making inspect consistent across
platforms * test/dl/test_cptr.rb (test_inspect): testing inspect git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/dl/cptr.c2
-rw-r--r--test/dl/test_cptr.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
index 0c85a91b6c..96f318be53 100644
--- a/ext/dl/cptr.c
+++ b/ext/dl/cptr.c
@@ -388,7 +388,7 @@ rb_dlptr_inspect(VALUE self)
char str[1024];
TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
- snprintf(str, 1023, "#<%s:%p ptr=%p size=%ld free=%p>",
+ snprintf(str, 1023, "#<%s:%p ptr=%#lx size=%ld free=%#lx>",
rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free);
return rb_str_new2(str);
}
diff --git a/test/dl/test_cptr.rb b/test/dl/test_cptr.rb
index 2b40a16fb1..5bc98ef35b 100644
--- a/test/dl/test_cptr.rb
+++ b/test/dl/test_cptr.rb
@@ -59,8 +59,8 @@ module DL
ptr = CPtr.new(0)
inspect = ptr.inspect
assert_match(/size=#{ptr.size}/, inspect)
- assert_match(/free=#{ptr.free}/, inspect)
- assert_match(/ptr=#{ptr.to_i}/, inspect)
+ assert_match(/free=#{sprintf("%#x", ptr.free.to_i)}/, inspect)
+ assert_match(/ptr=#{sprintf("%#x", ptr.to_i)}/, inspect)
end
def test_to_ptr_string