diff options
author | michal <michal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-16 07:38:40 +0000 |
---|---|---|
committer | michal <michal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-16 07:38:40 +0000 |
commit | 4e13d36561868d78e9e5ff9b24aba67d418c67ed (patch) | |
tree | 07808bdd94888f12e0e1b1a6f52777f213d50b91 /ext | |
parent | 9df466b287471d386f962ea41cf49c40f2059c8b (diff) |
-Wall cleanups (removed unused vars, no 'code has no effect' warnings)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/dbm/dbm.c | 1 | ||||
-rw-r--r-- | ext/dl/dl.c | 2 | ||||
-rw-r--r-- | ext/dl/handle.c | 3 | ||||
-rw-r--r-- | ext/dl/ptr.c | 12 | ||||
-rw-r--r-- | ext/dl/sym.c | 3 | ||||
-rw-r--r-- | ext/etc/etc.c | 2 | ||||
-rw-r--r-- | ext/readline/readline.c | 6 | ||||
-rw-r--r-- | ext/sdbm/init.c | 1 | ||||
-rw-r--r-- | ext/socket/socket.c | 12 | ||||
-rw-r--r-- | ext/stringio/stringio.c | 8 | ||||
-rw-r--r-- | ext/syslog/syslog.c | 1 |
11 files changed, 16 insertions, 35 deletions
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index c122f5a2b4..ad84589640 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -237,7 +237,6 @@ fdbm_select(argc, argv, obj) datum key, val; DBM *dbm; struct dbmdata *dbmp; - VALUE keystr, valstr; if (argc > 0) { rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc); diff --git a/ext/dl/dl.c b/ext/dl/dl.c index c1e5311c0a..0d806a7de7 100644 --- a/ext/dl/dl.c +++ b/ext/dl/dl.c @@ -554,8 +554,6 @@ rb_dl_malloc(VALUE self, VALUE size) VALUE rb_dl_strdup(VALUE self, VALUE str) { - void *p; - str = rb_String(str); return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree); } diff --git a/ext/dl/handle.c b/ext/dl/handle.c index 689ce4e3a5..23ad5ef066 100644 --- a/ext/dl/handle.c +++ b/ext/dl/handle.c @@ -133,9 +133,6 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self) VALUE sym, type; void (*func)(); VALUE val; - struct sym_data *data; - int *ctypes; - int i, ctypes_len; struct dl_handle *dlhandle; void *handle; const char *name, *stype; diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c index 8c2799a2b2..60f4ad00ed 100644 --- a/ext/dl/ptr.c +++ b/ext/dl/ptr.c @@ -178,7 +178,7 @@ rb_dlptr_s_allocate(VALUE klass) static VALUE rb_dlptr_initialize(int argc, VALUE argv[], VALUE self) { - VALUE ptr, sym, obj, size; + VALUE ptr, sym, size; struct ptr_data *data; void *p = NULL; freefunc_t f = NULL; @@ -279,7 +279,6 @@ VALUE rb_dlptr_free_set(VALUE self, VALUE val) { struct ptr_data *data; - int i; Data_Get_Struct(self, struct ptr_data, data); @@ -463,10 +462,9 @@ rb_dlptr_inspect(VALUE self) { struct ptr_data *data; char str[1024]; - VALUE name; Data_Get_Struct(self, struct ptr_data, data); - snprintf(str, 1023, "#<%s:0x%x ptr=0x%x size=%ld free=0x%x>", + snprintf(str, 1023, "#<%s:0x%p ptr=0x%p size=%ld free=0x%p>", rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free); return rb_str_new2(str); } @@ -519,9 +517,8 @@ rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self) { VALUE data_type, type, rest, vid; struct ptr_data *data; - int i, t, len, num; + int i, t, num; char *ctype; - long size; rb_scan_args(argc, argv, "11*", &data_type, &type, &rest); Data_Get_Struct(self, struct ptr_data, data); @@ -731,9 +728,8 @@ cary2ary(void *ptr, char t, int len) VALUE rb_dlptr_aref(int argc, VALUE argv[], VALUE self) { - VALUE val, key = Qnil, num = Qnil; + VALUE key = Qnil, num = Qnil; ID id; - int idx; struct ptr_data *data; int i; int offset; diff --git a/ext/dl/sym.c b/ext/dl/sym.c index b5de3b961f..95a813cc1f 100644 --- a/ext/dl/sym.c +++ b/ext/dl/sym.c @@ -145,7 +145,6 @@ VALUE rb_dlsym_initialize(int argc, VALUE argv[], VALUE self) { VALUE addr, name, type; - VALUE val; struct sym_data *data; void *saddr; const char *sname, *stype; @@ -266,7 +265,7 @@ rb_dlsym_inspect(VALUE self) str_size = RSTRING(proto)->len + 100; str = dlmalloc(str_size); snprintf(str, str_size - 1, - "#<DL::Symbol:0x%x func=0x%x '%s'>", + "#<DL::Symbol:0x%p func=0x%p '%s'>", sym, sym->func, RSTRING(proto)->ptr); val = rb_tainted_str_new2(str); dlfree(str); diff --git a/ext/etc/etc.c b/ext/etc/etc.c index b10943458d..ea8cb61802 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -93,7 +93,7 @@ etc_getpwuid(argc, argv, obj) VALUE obj; { #if defined(HAVE_GETPWENT) - VALUE id, ary; + VALUE id; int uid; struct passwd *pwd; diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 2f460ea3e0..fc17dad4f1 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -3,6 +3,7 @@ #include <errno.h> #include <stdio.h> +#include <unistd.h> #include <readline/readline.h> #include <readline/history.h> @@ -228,7 +229,6 @@ readline_s_set_basic_word_break_characters(self, str) { #ifdef READLINE_21_OR_LATER static char *basic_word_break_characters = NULL; - char *s; StringValue(str); if (basic_word_break_characters == NULL) { @@ -268,7 +268,6 @@ readline_s_set_completer_word_break_characters(self, str) { #ifdef READLINE_21_OR_LATER static char *completer_word_break_characters = NULL; - char *s; StringValue(str); if (completer_word_break_characters == NULL) { @@ -308,7 +307,6 @@ readline_s_set_basic_quote_characters(self, str) { #ifdef READLINE_21_OR_LATER static char *basic_quote_characters = NULL; - char *s; StringValue(str); if (basic_quote_characters == NULL) { @@ -348,7 +346,6 @@ readline_s_set_completer_quote_characters(self, str) { #ifdef READLINE_21_OR_LATER static char *completer_quote_characters = NULL; - char *s; StringValue(str); if (completer_quote_characters == NULL) { @@ -388,7 +385,6 @@ readline_s_set_filename_quote_characters(self, str) { #ifdef READLINE_21_OR_LATER static char *filename_quote_characters = NULL; - char *s; StringValue(str); if (filename_quote_characters == NULL) { diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c index a2b90438f6..f20e3cfa58 100644 --- a/ext/sdbm/init.c +++ b/ext/sdbm/init.c @@ -225,7 +225,6 @@ fsdbm_select(argc, argv, obj) datum key, val; DBM *dbm; struct dbmdata *dbmp; - VALUE keystr, valstr; if (argc > 0) { rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc); diff --git a/ext/socket/socket.c b/ext/socket/socket.c index d0838b1580..6cdedd22e0 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -879,7 +879,7 @@ init_inetsock_internal(arg) struct inetsock_arg *arg; { int type = arg->type; - struct addrinfo hints, *res; + struct addrinfo *res; int fd, status; char *syscall; @@ -972,12 +972,11 @@ tcp_init(argc, argv, sock) VALUE remote_host, remote_serv; VALUE local_host, local_serv; - int pcount = rb_scan_args(argc, argv, "22", - &remote_host, &remote_serv, - &local_host, &local_serv); + rb_scan_args(argc, argv, "22", &remote_host, &remote_serv, + &local_host, &local_serv); return init_inetsock(sock, remote_host, remote_serv, - local_host, local_serv, INET_CLIENT); + local_host, local_serv, INET_CLIENT); } #ifdef SOCKS @@ -1362,7 +1361,6 @@ udp_connect(sock, host, port) VALUE sock, host, port; { OpenFile *fptr; - int fd; struct udp_arg arg; VALUE ret; @@ -2185,7 +2183,7 @@ sock_s_getnameinfo(argc, argv) int error; struct sockaddr_storage ss; struct sockaddr *sap; - char *ep, *ap; + char *ap; sa = flags = Qnil; rb_scan_args(argc, argv, "11", &sa, &flags); diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 6369d10589..93d7460daf 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -148,7 +148,7 @@ static VALUE strio_closed _((VALUE)); static VALUE strio_closed_read _((VALUE)); static VALUE strio_closed_write _((VALUE)); static VALUE strio_eof _((VALUE)); -static VALUE strio_become _((VALUE, VALUE)); +/* static VALUE strio_become _((VALUE, VALUE)); NOT USED */ static VALUE strio_get_lineno _((VALUE)); static VALUE strio_set_lineno _((VALUE, VALUE)); static VALUE strio_get_pos _((VALUE)); @@ -156,7 +156,7 @@ static VALUE strio_set_pos _((VALUE, VALUE)); static VALUE strio_rewind _((VALUE)); static VALUE strio_seek _((int, VALUE *, VALUE)); static VALUE strio_get_sync _((VALUE)); -static VALUE strio_set_sync _((VALUE, VALUE)); +/* static VALUE strio_set_sync _((VALUE, VALUE)); NOT USED */ static VALUE strio_each_byte _((VALUE)); static VALUE strio_getc _((VALUE)); static VALUE strio_ungetc _((VALUE, VALUE)); @@ -167,8 +167,8 @@ static VALUE strio_readline _((int, VALUE *, VALUE)); static VALUE strio_each _((int, VALUE *, VALUE)); static VALUE strio_readlines _((int, VALUE *, VALUE)); static VALUE strio_write _((VALUE, VALUE)); -static VALUE strio_print _((int, VALUE *, VALUE)); -static VALUE strio_printf _((int, VALUE *, VALUE)); +/* static VALUE strio_print _((int, VALUE *, VALUE)); NOT USED */ +/* static VALUE strio_printf _((int, VALUE *, VALUE)); NOT USED */ static VALUE strio_putc _((VALUE, VALUE)); static VALUE strio_read _((int, VALUE *, VALUE)); static VALUE strio_size _((VALUE)); diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c index 3e86569f06..5ee2c6b89a 100644 --- a/ext/syslog/syslog.c +++ b/ext/syslog/syslog.c @@ -54,7 +54,6 @@ static VALUE mSyslog_close(VALUE self) static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self) { VALUE ident, opt, fac; - int mask; if (syslog_opened) { rb_raise(rb_eRuntimeError, "syslog already open"); |