ruby-changes:16766
From: naruse <ko1@a...>
Date: Tue, 27 Jul 2010 16:14:07 +0900 (JST)
Subject: [ruby-changes:16766] Ruby:r28762 (trunk): * class.c, compile.c, dir.c, file.c, iseq.c, parse.y, random.c:
naruse 2010-07-27 16:13:43 +0900 (Tue, 27 Jul 2010) New Revision: 28762 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28762 Log: * class.c, compile.c, dir.c, file.c, iseq.c, parse.y, random.c: clean unused-value warnings. * cont.c, process.c, vm_exec.h: clean cast warnings. Modified files: trunk/ChangeLog trunk/class.c trunk/compile.c trunk/cont.c trunk/dir.c trunk/file.c trunk/iseq.c trunk/parse.y trunk/process.c trunk/random.c trunk/vm_exec.h Index: ChangeLog =================================================================== --- ChangeLog (revision 28761) +++ ChangeLog (revision 28762) @@ -1,3 +1,10 @@ +Tue Jul 27 16:09:12 2010 NARUSE, Yui <naruse@r...> + + * class.c, compile.c, dir.c, file.c, iseq.c, parse.y, random.c: + clean unused-value warnings. + + * cont.c, process.c, vm_exec.h: clean cast warnings. + Mon Jul 26 22:34:37 2010 Tanaka Akira <akr@f...> * ext/pathname/pathname.c (path_taint): Pathname#taint translated from Index: iseq.c =================================================================== --- iseq.c (revision 28761) +++ iseq.c (revision 28762) @@ -436,7 +436,7 @@ #define CHECK_ARRAY(v) rb_convert_type(v, T_ARRAY, "Array", "to_ary") #define CHECK_STRING(v) rb_convert_type(v, T_STRING, "String", "to_str") #define CHECK_SYMBOL(v) rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym") -static inline VALUE CHECK_INTEGER(VALUE v) {NUM2LONG(v); return v;} +static inline VALUE CHECK_INTEGER(VALUE v) {(void)NUM2LONG(v); return v;} static VALUE iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt) { Index: compile.c =================================================================== --- compile.c (revision 28761) +++ compile.c (revision 28762) @@ -5337,7 +5337,7 @@ #define CHECK_ARRAY(v) rb_convert_type(v, T_ARRAY, "Array", "to_ary") #define CHECK_STRING(v) rb_convert_type(v, T_STRING, "String", "to_str") #define CHECK_SYMBOL(v) rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym") -static inline VALUE CHECK_INTEGER(VALUE v) {NUM2LONG(v); return v;} +static inline VALUE CHECK_INTEGER(VALUE v) {(void)NUM2LONG(v); return v;} VALUE rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args, Index: dir.c =================================================================== --- dir.c (revision 28761) +++ dir.c (revision 28762) @@ -352,8 +352,8 @@ #define GlobPathValue(str, safe) \ /* can contain null bytes as separators */ \ (!RB_TYPE_P(str, T_STRING) ? \ - FilePathValue(str) : \ - (check_safe_glob(str, safe), \ + (void)FilePathValue(str) : \ + (void)(check_safe_glob(str, safe), \ check_glob_encoding(str), (str))) #define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0) #define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding())) Index: parse.y =================================================================== --- parse.y (revision 28761) +++ parse.y (revision 28762) @@ -6307,9 +6307,9 @@ VALUE name = 0, val = 0; const char *beg, *end, *vbeg, *vend; #define str_copy(_s, _p, _n) ((_s) \ - ? (rb_str_resize((_s), (_n)), \ + ? (void)(rb_str_resize((_s), (_n)), \ MEMCPY(RSTRING_PTR(_s), (_p), char, (_n)), (_s)) \ - : ((_s) = STR_NEW((_p), (_n)))) + : (void)((_s) = STR_NEW((_p), (_n)))) if (len <= 7) return FALSE; if (!(beg = magic_comment_marker(str, len))) return FALSE; @@ -6474,12 +6474,12 @@ #else #define ambiguous_operator(op, syn) dispatch2(operator_ambiguous, ripper_intern(op), rb_str_new_cstr(syn)) #endif -#define warn_balanced(op, syn) \ +#define warn_balanced(op, syn) ((void) \ (last_state != EXPR_CLASS && last_state != EXPR_DOT && \ last_state != EXPR_FNAME && last_state != EXPR_ENDFN && \ last_state != EXPR_ENDARG && \ space_seen && !ISSPACE(c) && \ - (ambiguous_operator(op, syn), 0)) + (ambiguous_operator(op, syn), 0))) static int parser_yylex(struct parser_params *parser) @@ -7291,7 +7291,7 @@ } pushback(c); if (IS_SPCARG(c)) { - arg_ambiguous(); + (void)arg_ambiguous(); lex_strterm = NEW_STRTERM(str_regexp, '/', 0); return tREGEXP_BEG; } Index: class.c =================================================================== --- class.c (revision 28761) +++ class.c (revision 28762) @@ -1274,7 +1274,7 @@ VALUE klass = singleton_class_of(obj); /* ensures an exposed class belongs to its own eigenclass */ - if (TYPE(obj) == T_CLASS) ENSURE_EIGENCLASS(klass); + if (TYPE(obj) == T_CLASS) (void)ENSURE_EIGENCLASS(klass); return klass; } Index: process.c =================================================================== --- process.c (revision 28761) +++ process.c (revision 28762) @@ -985,7 +985,7 @@ static int forked_child = 0; #define before_exec() \ - (rb_enable_interrupt(), (forked_child ? 0 : (rb_thread_stop_timer_thread(), 1))) + (rb_enable_interrupt(), (void)(forked_child ? 0 : (rb_thread_stop_timer_thread(), 1))) #define after_exec() \ (rb_thread_reset_timer_thread(), rb_thread_start_timer_thread(), forked_child = 0, rb_disable_interrupt()) #define before_fork() before_exec() Index: vm_exec.h =================================================================== --- vm_exec.h (revision 28761) +++ vm_exec.h (revision 28762) @@ -112,7 +112,7 @@ /* for GCC 3.4.x */ #define TC_DISPATCH(insn) \ INSN_DISPATCH_SIG(insn); \ - goto *GET_CURRENT_INSN(); \ + goto *(void const *)GET_CURRENT_INSN(); \ ; #else Index: cont.c =================================================================== --- cont.c (revision 28761) +++ cont.c (revision 28762) @@ -564,7 +564,7 @@ getcontext(context); ptr = fiber_machine_stack_alloc(size); context->uc_link = NULL; - context->uc_stack.ss_sp = ptr; + context->uc_stack.ss_sp = (char *)ptr; context->uc_stack.ss_size = size; makecontext(context, rb_fiber_start, 0); sth->machine_stack_start = ptr + STACK_DIR_UPPER(0, size / sizeof(VALUE)); Index: file.c =================================================================== --- file.c (revision 28761) +++ file.c (revision 28762) @@ -3119,7 +3119,7 @@ #define check_expand_path_args(fname, dname) \ ((fname = rb_get_path(fname)), \ - (NIL_P(dname) ? dname : (dname = rb_get_path(dname)))) + (void)(NIL_P(dname) ? dname : (dname = rb_get_path(dname)))) static VALUE file_expand_path_1(VALUE fname) Index: random.c =================================================================== --- random.c (revision 28761) +++ random.c (revision 28762) @@ -1066,7 +1066,7 @@ } else { v = Qnil; - NUM2LONG(vmax); + (void)NUM2LONG(vmax); } if (NIL_P(v)) { VALUE mesg = rb_str_new_cstr("invalid argument - "); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/