[前][次][番号順一覧][スレッド一覧]

ruby-changes:19011

From: kosaki <ko1@a...>
Date: Mon, 7 Mar 2011 21:54:34 +0900 (JST)
Subject: [ruby-changes:19011] Ruby:r31049 (trunk): small cleanup.

kosaki	2011-03-07 21:54:27 +0900 (Mon, 07 Mar 2011)

  New Revision: 31049

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31049

  Log:
    small cleanup.

  Modified files:
    trunk/process.c

Index: process.c
===================================================================
--- process.c	(revision 31048)
+++ process.c	(revision 31049)
@@ -4612,7 +4612,7 @@
 static VALUE
 proc_setgroups(VALUE obj, VALUE ary)
 {
-    size_t ngroups, i;
+    int ngroups, i;
     rb_gid_t *groups;
     long getgr_buf_len = sysconf(_SC_GETGR_R_SIZE_MAX);
     char* getgr_buf;
@@ -4623,13 +4623,13 @@
 
     Check_Type(ary, T_ARRAY);
 
+    if (RARRAY_LEN(ary) > maxgroups())
+	rb_raise(rb_eArgError, "too many groups, %d max", maxgroups());
+
     ngroups = RARRAY_LEN(ary);
-    if (ngroups > (size_t)maxgroups())
-	rb_raise(rb_eArgError, "too many groups, %u max", maxgroups());
-
     groups = ALLOCA_N(rb_gid_t, ngroups);
 
-    for (i = 0; i < ngroups && i < (size_t)RARRAY_LEN(ary); i++) {
+    for (i = 0; i < ngroups; i++) {
 	VALUE g = RARRAY_PTR(ary)[i];
 
 	if (FIXNUM_P(g)) {
@@ -4659,7 +4659,7 @@
 	}
     }
 
-    if (setgroups((int)ngroups, groups) == -1) /* ngroups <= maxgroups */
+    if (setgroups(ngroups, groups) == -1) /* ngroups <= maxgroups */
 	rb_sys_fail(0);
 
     return proc_getgroups(obj);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]