* ext/dl/cptr.c (rb_dlptr_new2): remove unused variable.

* ext/iconv/iconv.c (get_iconv_opt_i): ditto. * ext/syck/token.c (Plain): fix types on LP64. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fgo · Jan 30, 2012 · ef84b7c · ef84b7c
1 parent 72969cd
commit ef84b7c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
@@ -63,15 +63,6 @@ static const rb_data_type_t dlptr_data_type = {
     {dlptr_mark, dlptr_free, dlptr_memsize,},
 };
 
-void
-dlptr_init(VALUE val)
-{
-    struct ptr_data *data;
-
-    TypedData_Get_Struct(val, struct ptr_data, &dlptr_data_type, data);
-    OBJ_TAINT(val);
-}
-
 VALUE
 rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
 {
@@ -83,7 +74,7 @@ rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
     data->ptr = ptr;
     data->free = func;
     data->size = size;
-    dlptr_init(val);
+    OBJ_TAINT(val);
 
     return val;
 }

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
@@ -563,13 +563,17 @@ iconv_s_allocate(VALUE klass)
 static VALUE
 get_iconv_opt_i(VALUE i, VALUE arg)
 {
+    VALUE name;
+#if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ
+    VALUE val;
     struct rb_iconv_opt_t *opt = (struct rb_iconv_opt_t *)arg;
-    VALUE name, val;
+#endif
 
-    (void)opt;
     i = rb_Array(i);
     name = rb_ary_entry(i, 0);
+#if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ
     val = rb_ary_entry(i, 1);
+#endif
     do {
 	if (SYMBOL_P(name)) {
 	    ID id = SYM2ID(name);

diff --git a/ext/syck/token.c b/ext/syck/token.c
@@ -1489,8 +1489,8 @@ yy108:	switch(yych){
 
 Plain:
     {
-        int qidx = 0;
-        int qcapa = 100;
+        ptrdiff_t qidx = 0;
+        ptrdiff_t qcapa = 100;
         char *qstr = S_ALLOC_N( char, qcapa );
         SyckLevel *plvl;
         int parentIndent;