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

* dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused

variable" [ruby-dev:26387]

(patch from Kazuhiro NISHIYAMA)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-06-28 13:09:58 +00:00
parent d8322d404f
commit 477187defd
6 changed files with 20 additions and 7 deletions

View file

@ -1,3 +1,8 @@
Tue Jun 28 21:59:29 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
variable" [ruby-dev:26387]
Sat Jun 25 17:15:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should

1
dir.c
View file

@ -1332,7 +1332,6 @@ static VALUE
dir_open_dir(path)
VALUE path;
{
struct dir_data *dp;
VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
if (TYPE(dir) != T_DATA ||

9
eval.c
View file

@ -6035,7 +6035,7 @@ rb_call_super(argc, argv)
int argc;
const VALUE *argv;
{
VALUE result, self, klass, k;
VALUE result, self, klass;
if (ruby_frame->last_class == 0) {
rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
@ -10648,7 +10648,9 @@ rb_thread_select(max, read, write, except, timeout)
fd_set *read, *write, *except;
struct timeval *timeout;
{
#ifndef linux
double limit;
#endif
int n;
if (!read && !write && !except) {
@ -10660,10 +10662,12 @@ rb_thread_select(max, read, write, except, timeout)
return 0;
}
#ifndef linux
if (timeout) {
limit = timeofday()+
(double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
}
#endif
if (rb_thread_critical ||
curr_thread == curr_thread->next ||
@ -11509,7 +11513,7 @@ rb_thread_start_0(fn, arg, th)
{
volatile rb_thread_t th_save = th;
volatile VALUE thread = th->thread;
struct BLOCK *volatile saved_block = 0, *block;
struct BLOCK *volatile saved_block = 0;
enum thread_status status;
int state;
@ -12353,7 +12357,6 @@ rb_callcc(self)
volatile rb_thread_t th_save;
struct tag *tag;
struct RVarmap *vars;
struct BLOCK *blk;
THREAD_ALLOC(th);
cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th);

2
hash.c
View file

@ -880,8 +880,6 @@ static VALUE
rb_hash_clear(hash)
VALUE hash;
{
void *tmp;
rb_hash_modify(hash);
if (RHASH(hash)->tbl->num_entries > 0) {
rb_hash_foreach(hash, clear_i, 0);

View file

@ -1351,7 +1351,13 @@ rb_syswait(pid)
int pid;
{
static int overriding;
RETSIGTYPE (*hfunc)_((int)), (*qfunc)_((int)), (*ifunc)_((int));
#ifdef SIGHUP
RETSIGTYPE (*hfunc)_((int));
#endif
#ifdef SIGQUIT
RETSIGTYPE (*qfunc)_((int));
#endif
RETSIGTYPE (*ifunc)_((int));
int status;
int i, hooked = Qfalse;

2
ruby.c
View file

@ -1005,7 +1005,9 @@ set_arg0(val, id)
{
char *s;
long i;
#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
static int len;
#endif
if (origargv == 0) rb_raise(rb_eRuntimeError, "$0 not initialized");
StringValue(val);