From: Michal Rokos <m.rokos@...>
Date: 2002-04-17T08:44:16+09:00
Subject: [Patch] IO cleanup

Hello,

	some bits for io.c:
		- complete off_t handling
		- 1 missed arg def
		- rb_scan_args code polishing
	Best regards
		Michal


Index: io.c
===================================================================
RCS file: /src/ruby/io.c,v
retrieving revision 1.134
diff -u -r1.134 io.c
--- io.c	2002/04/15 07:48:45	1.134
+++ io.c	2002/04/16 23:16:41
@@ -364,7 +364,7 @@
     int whence;
 {
     OpenFile *fptr;
-    long pos;
+    off_t pos;
 
     GetOpenFile(io, fptr);
     pos = fseeko(fptr->f, NUM2OFFT(offset), whence);
@@ -381,11 +381,11 @@
     VALUE io;
 {
     VALUE offset, ptrname;
-    int whence;
+    int whence = SEEK_SET;
 
-    rb_scan_args(argc, argv, "11", &offset, &ptrname);
-    if (argc == 1) whence = SEEK_SET;
-    else whence = NUM2INT(ptrname);
+    if (rb_scan_args(argc, argv, "11", &offset, &ptrname) == 2) {
+	whence = NUM2INT(ptrname);
+    }
 
     return rb_io_seek(io, offset, whence);
 }
@@ -395,14 +395,14 @@
      VALUE io, offset;
 {
     OpenFile *fptr;
-    long pos;
+    off_t pos;
 
     GetOpenFile(io, fptr);
     pos = fseeko(fptr->f, NUM2OFFT(offset), SEEK_SET);
     if (pos != 0) rb_sys_fail(fptr->path);
     clearerr(fptr->f);
 
-    return INT2NUM(pos);
+    return OFFT2NUM(pos);
 }
 
 static VALUE
@@ -1161,6 +1161,7 @@
 static void
 fptr_finalize(fptr, fin)
     OpenFile *fptr;
+    int fin;
 {
     int n1 = 0, n2 = 0, e = 0, f1, f2 = -1;
 
@@ -1318,13 +1319,13 @@
     VALUE io;
 {
     VALUE offset, ptrname;
-    int whence;
+    int whence = SEEK_SET;
     OpenFile *fptr;
     off_t pos;
 
-    rb_scan_args(argc, argv, "11", &offset, &ptrname);
-    if (argc == 1) whence = SEEK_SET;
-    else whence = NUM2INT(ptrname);
+    if (rb_scan_args(argc, argv, "11", &offset, &ptrname) == 2) {
+	whence = NUM2INT(ptrname);
+    }
 
     GetOpenFile(io, fptr);
     if ((fptr->mode & FMODE_READABLE) && READ_DATA_PENDING(fptr->f)) {

-- 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Michal Rokos                         Czech Technical University, Prague
E-mail:m.rokos@sh.cvut.cz  ICQ:36118339  Jabber:majkl@jabber.sh.cvut.cz
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-