[ruby-dev:7328] [PATCH] unused variable cleanup

小松です。

Solaris 2.5.1でgcc -Wallで出たunused variableのcleanupです。

Index: ruby/eval.c
===================================================================
RCS file: /home/cvs/ruby/eval.c,v
retrieving revision 1.1.1.3.2.27
diff -u -p -r1.1.1.3.2.27 eval.c
--- ruby/eval.c	1999/07/15 07:59:38	1.1.1.3.2.27
+++ ruby/eval.c	1999/07/15 12:22:30
@@ -6258,7 +6258,7 @@ rb_thread_schedule()
     }
 
     if (num_waiting_on_fd > 0 || num_waiting_on_timer > 0) {
-	fd_set readfds, writefds, exceptfds;
+	fd_set readfds;
 	struct timeval delay_tv, *delay_ptr;
 	double delay, now;	/* OK */
 
Index: ruby/regex.c
===================================================================
RCS file: /home/cvs/ruby/regex.c,v
retrieving revision 1.1.1.3.2.27
diff -u -p -r1.1.1.3.2.27 regex.c
--- ruby/regex.c	1999/07/15 07:59:52	1.1.1.3.2.27
+++ ruby/regex.c	1999/07/15 12:22:33
@@ -2852,7 +2852,7 @@ re_compile_fastmap(bufp)
 	}
 	{
 	  unsigned short size;
-	  unsigned long c, beg, end;
+	  unsigned long c, beg;
 
 	  p += p[-1] + 2;
 	  size = EXTRACT_UNSIGNED(&p[-2]);
Index: ruby/time.c
===================================================================
RCS file: /home/cvs/ruby/time.c,v
retrieving revision 1.1.1.3.2.10
diff -u -p -r1.1.1.3.2.10 time.c
--- ruby/time.c	1999/07/15 07:59:57	1.1.1.3.2.10
+++ ruby/time.c	1999/07/15 12:22:33
@@ -104,7 +104,6 @@ struct timeval
 rb_time_interval(time)
     VALUE time;
 {
-    struct time_object *tobj;
     struct timeval t;
 
     switch (TYPE(time)) {
Index: ruby/ext/nkf/nkf1.7/nkf.c
===================================================================
RCS file: /home/cvs/ruby/ext/nkf/nkf1.7/Attic/nkf.c,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 nkf.c
--- ruby/ext/nkf/nkf1.7/nkf.c	1999/04/13 01:29:58	1.1.2.3
+++ ruby/ext/nkf/nkf1.7/nkf.c	1999/07/15 12:22:35
@@ -1571,7 +1571,7 @@ mime_begin(f)
 FILE *f;
 {
     int c1;
-    int i,j,k;
+    int i,j;
     int r[MAXRECOVER];    /* recovery buffer, max mime pattern lenght */
 
     mime_mode = FALSE;
Index: ruby/ext/pty/pty.c
===================================================================
RCS file: /home/cvs/ruby/ext/pty/Attic/pty.c,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 pty.c
--- ruby/ext/pty/pty.c	1999/07/15 07:59:58	1.1.2.7
+++ ruby/ext/pty/pty.c	1999/07/15 12:22:35
@@ -208,7 +208,6 @@ establishShell(shellname, info)
     struct pty_info *info;
 {	
     static int		i,j,master,slave,currentPid;
-    static char		procName[32];
     char		*p,*getenv();
     struct passwd	*pwent;
     RETSIGTYPE		chld_changed();
Index: ruby/ext/sdbm/_sdbm.c
===================================================================
RCS file: /home/cvs/ruby/ext/sdbm/Attic/_sdbm.c,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 _sdbm.c
--- ruby/ext/sdbm/_sdbm.c	1999/05/07 08:23:32	1.1.2.1
+++ ruby/ext/sdbm/_sdbm.c	1999/07/15 12:22:36
@@ -363,11 +363,11 @@ int need;
 	char twin[PBLKSIZ];
 #ifdef MSDOS
 	char zer[PBLKSIZ];
+	long oldtail;
 #endif
 	char *pag = db->pagbuf;
 	char *new = twin;
 	register int smax = SPLTMAX;
-	long oldtail;
 
 	do {
 /*
Index: ruby/ext/socket/getaddrinfo.c
===================================================================
RCS file: /home/cvs/ruby/ext/socket/Attic/getaddrinfo.c,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 getaddrinfo.c
--- ruby/ext/socket/getaddrinfo.c	1999/06/24 04:24:06	1.1.2.8
+++ ruby/ext/socket/getaddrinfo.c	1999/07/15 12:22:36
@@ -446,7 +446,9 @@ getaddrinfo(hostname, servname, hints, r
 	for (i = 0; afdl[i].a_af; i++) {
 		if (inet_pton(afdl[i].a_af, hostname, pton)) {
 			u_long v4a;
+#ifdef INET6
 			u_char pfx;
+#endif
 
 			switch (afdl[i].a_af) {
 			case AF_INET:
@@ -521,8 +523,11 @@ get_name(addr, afd, res, numaddr, pai, p
 	u_short port = port0 & 0xffff;
 	struct hostent *hp;
 	struct addrinfo *cur;
-	int error = 0, h_error;
-	
+	int error = 0;
+#ifdef INET6
+	int h_error;
+#endif
+
 #ifdef INET6
 	hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
 #else
Index: ruby/ext/socket/getnameinfo.c
===================================================================
RCS file: /home/cvs/ruby/ext/socket/Attic/getnameinfo.c,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 getnameinfo.c
--- ruby/ext/socket/getnameinfo.c	1999/06/09 09:21:35	1.1.2.8
+++ ruby/ext/socket/getnameinfo.c	1999/07/15 12:22:36
@@ -135,7 +135,9 @@ getnameinfo(sa, salen, host, hostlen, se
 	int family, len, i;
 	char *addr, *p;
 	u_long v4a;
+#ifdef INET6
 	u_char pfx;
+#endif
 	int h_error;
 	char numserv[512];
 	char numaddr[512];
Index: ruby/ext/socket/socket.c
===================================================================
RCS file: /home/cvs/ruby/ext/socket/socket.c,v
retrieving revision 1.1.1.3.2.21
diff -u -p -r1.1.1.3.2.21 socket.c
--- ruby/ext/socket/socket.c	1999/06/24 04:24:06	1.1.1.3.2.21
+++ ruby/ext/socket/socket.c	1999/07/15 12:22:37
@@ -476,7 +476,6 @@ ip_addrsetup(host, port)
 	hostp = NULL;
     }
     else if (rb_obj_is_kind_of(host, rb_cInteger)) {
-	struct sockaddr_in sin;
 	long i = NUM2LONG(host);
 
 	mkinetaddr(htonl(i), hbuf, sizeof(hbuf));
@@ -535,7 +534,6 @@ ipaddr(sockaddr)
 {
     VALUE family, port, addr1, addr2;
     VALUE ary;
-    struct addrinfo hints, *res;
     int error;
     char hbuf[1024], pbuf[1024];
 
@@ -665,7 +663,6 @@ open_inet(class, h, serv, type)
     struct addrinfo hints, *res, *res0;
     int fd, status;
     char *syscall;
-    VALUE sock;
     char pbuf[1024], *portp;
     char *host;
     int error;
@@ -1434,7 +1431,7 @@ sock_accept(sock)
    VALUE sock;
 {
     OpenFile *fptr;
-    VALUE addr, sock2;
+    VALUE sock2;
     char buf[1024];
     int len = sizeof buf;
 
@@ -1519,7 +1516,6 @@ static VALUE
 mkaddrinfo(res0)
     struct addrinfo *res0;
 {
-    char **pch;
     VALUE base, ary;
     struct addrinfo *res;
 
Index: ruby/missing/vsnprintf.c
===================================================================
RCS file: /home/cvs/ruby/missing/Attic/vsnprintf.c,v
retrieving revision 1.1.1.1.2.2
diff -u -p -r1.1.1.1.2.2 vsnprintf.c
--- ruby/missing/vsnprintf.c	1999/02/05 10:27:34	1.1.1.1.2.2
+++ ruby/missing/vsnprintf.c	1999/07/15 12:22:38
@@ -223,9 +223,7 @@ static BSD__sfvwrite(fp, uio)
 	register size_t len;
 	register char *p;
 	register struct __siov *iov;
-	register int w, s;
-	char *nl;
-	int nlknown, nldist;
+	register int w;
 
 	if ((len = uio->uio_resid) == 0)
 		return (0);

--
小松克行 / Katsuyuki Komatsu <[e-mail]>