diff --git a/array.c b/array.c index da00c1a1c5..055526f0ce 100644 --- a/array.c +++ b/array.c @@ -2006,7 +2006,7 @@ rb_ary_transpose(VALUE ary) } } else if (elen != RARRAY(tmp)->len) { - rb_raise(rb_eIndexError, "element size differs (%d should be %d)", + rb_raise(rb_eIndexError, "element size differs (%ld should be %ld)", RARRAY(tmp)->len, elen); } for (j=0; j 0) { diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c index c8883c9f8d..f3e215e8d6 100644 --- a/ext/sdbm/init.c +++ b/ext/sdbm/init.c @@ -219,7 +219,6 @@ fsdbm_select(obj) VALUE obj; { VALUE new = rb_ary_new(); - int i; datum key, val; DBM *dbm; struct dbmdata *dbmp; diff --git a/io.c b/io.c index b335eae750..8b369ae133 100644 --- a/io.c +++ b/io.c @@ -1079,7 +1079,7 @@ static VALUE rb_io_inspect(VALUE obj) { OpenFile *fptr; - char *buf, *cname, *st = ""; + char *cname, *st = ""; fptr = RFILE(rb_io_taint_check(obj))->fptr; if (!fptr || !fptr->path) return rb_any_to_s(obj); diff --git a/pack.c b/pack.c index 239f03d2e9..99faeca4d1 100644 --- a/pack.c +++ b/pack.c @@ -2056,7 +2056,7 @@ utf8_to_uv(char *p, long *lenp) rb_raise(rb_eArgError, "malformed UTF-8 character"); } if (n > *lenp) { - rb_raise(rb_eArgError, "malformed UTF-8 character (expected %d bytes, given %d bytes)", + rb_raise(rb_eArgError, "malformed UTF-8 character (expected %ld bytes, given %ld bytes)", n, *lenp); } *lenp = n--; diff --git a/parse.y b/parse.y index a72c6808d1..50616cd7ab 100644 --- a/parse.y +++ b/parse.y @@ -4379,9 +4379,6 @@ none : /* none */ # undef yylval # define yylval (*((YYSTYPE*)(parser->parser_yylval))) -#ifndef RIPPER -static VALUE rb_parser_s_new _((void)); -#endif static int parser_regx_options _((struct parser_params*)); static int parser_tokadd_string _((struct parser_params*,int,int,int,long*)); static int parser_parse_string _((struct parser_params*,NODE*)); @@ -4531,7 +4528,6 @@ yycompile(parser, f, line) int line; { int n; - NODE *node = 0; struct RVarmap *vp, *vars = ruby_dyna_vars; const char *kcode_save; @@ -7397,7 +7393,7 @@ rb_backref_error(node) { switch (nd_type(node)) { case NODE_NTH_REF: - rb_compile_error("Can't set variable $%d", node->nd_nth); + rb_compile_error("Can't set variable $%ld", node->nd_nth); break; case NODE_BACK_REF: rb_compile_error("Can't set variable $%c", (int)node->nd_nth); @@ -8076,20 +8072,6 @@ new_call(r,m,a) return NEW_CALL(r,m,a); } -static NODE* -fcall_gen(parser, m, a) - struct parser_params *parser; - ID m; - NODE *a; -{ - if (is_local_id(m)) { - if ((dyna_in_block() && rb_dvar_defined(m)) || local_id(m)) { - return NEW_CALL(gettable(m), rb_intern("call"), a); - } - } - return NEW_FCALL(m,a); -} - static NODE* new_fcall_gen(parser, m, a) struct parser_params *parser; diff --git a/signal.c b/signal.c index dd79b861ac..7c2f35f91f 100644 --- a/signal.c +++ b/signal.c @@ -571,7 +571,7 @@ static VALUE trap(struct trap_arg *arg) { sighandler_t func, oldfunc; - VALUE command, tmp, oldcmd; + VALUE command, oldcmd; int sig = -1; char *s; diff --git a/struct.c b/struct.c index 7270c7d514..674fc9c62d 100644 --- a/struct.c +++ b/struct.c @@ -48,7 +48,7 @@ rb_struct_members(VALUE s) VALUE members = rb_struct_s_members(rb_obj_class(s)); if (RSTRUCT(s)->len != RARRAY(members)->len) { - rb_raise(rb_eTypeError, "struct size differs (%d required %d given)", + rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)", RARRAY(members)->len, RSTRUCT(s)->len); } return members; @@ -583,7 +583,7 @@ rb_struct_aset_id(VALUE s, ID id, VALUE val) rb_struct_modify(s); len = RARRAY(members)->len; if (RSTRUCT(s)->len != RARRAY(members)->len) { - rb_raise(rb_eTypeError, "struct size differs (%d required %d given)", + rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)", RARRAY(members)->len, RSTRUCT(s)->len); } for (i=0; i