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

ruby-changes:6538

From: nobu <ko1@a...>
Date: Sun, 13 Jul 2008 06:57:31 +0900 (JST)
Subject: [ruby-changes:6538] Ruby:r18053 (ruby_1_8, trunk): * ext/pty/pty.c (raise_from_wait, pty_syswait, get_device_once):

nobu	2008-07-13 06:57:11 +0900 (Sun, 13 Jul 2008)

  New Revision: 18053

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

  Log:
    * ext/pty/pty.c (raise_from_wait, pty_syswait, get_device_once):
      constified.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/pty/pty.c
    trunk/ChangeLog
    trunk/ext/pty/pty.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18052)
+++ ChangeLog	(revision 18053)
@@ -1,3 +1,8 @@
+Sun Jul 13 06:57:09 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/pty/pty.c (raise_from_wait, pty_syswait, get_device_once):
+	  constified.
+
 Sun Jul 13 05:37:50 2008  NAKAMURA Usaku  <usa@r...>
 
 	* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX): typo.
Index: ext/pty/pty.c
===================================================================
--- ext/pty/pty.c	(revision 18052)
+++ ext/pty/pty.c	(revision 18053)
@@ -131,7 +131,7 @@
 };
 
 static void
-raise_from_wait(char *state, struct pty_info *info)
+raise_from_wait(const char *state, const struct pty_info *info)
 {
     char buf[1024];
     VALUE exc;
@@ -143,8 +143,9 @@
 }
 
 static VALUE
-pty_syswait(struct pty_info *info)
+pty_syswait(void *arg)
 {
+    const struct pty_info *const info = arg;
     rb_pid_t cpid;
     int status;
 
@@ -363,7 +364,7 @@
     if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
     return -1;
 #else
-    char **p;
+    const char *const *p;
     char MasterName[DEVICELEN];
 
     for (p = deviceNo; *p != NULL; p++) {
Index: ruby_1_8/ext/pty/pty.c
===================================================================
--- ruby_1_8/ext/pty/pty.c	(revision 18052)
+++ ruby_1_8/ext/pty/pty.c	(revision 18053)
@@ -130,8 +130,8 @@
 
 static void
 raise_from_wait(state, info)
-    struct pty_info *info;
-    char *state;
+    const char *state;
+    const struct pty_info *info;
 {
     extern VALUE rb_last_status;
     char buf[1024];
@@ -144,9 +144,9 @@
 }
 
 static VALUE
-pty_syswait(info)
-    struct pty_info *info;
+pty_syswait(void *arg)
 {
+    const struct pty_info *info = arg;
     int cpid, status;
 
     for (;;) {
@@ -204,7 +204,7 @@
     int			status;
 
     if (argc == 0) {
-	char *shellname;
+	const char *shellname;
 
 	if ((p = getenv("SHELL")) != NULL) {
 	    shellname = p;
@@ -372,7 +372,7 @@
     if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
     return -1;
 #else
-    char **p;
+    const char *const *p;
     char MasterName[DEVICELEN];
 
     for (p = deviceNo; *p != NULL; p++) {
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18052)
+++ ruby_1_8/ChangeLog	(revision 18053)
@@ -1,3 +1,8 @@
+Sun Jul 13 06:57:09 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/pty/pty.c (raise_from_wait, pty_syswait, get_device_once):
+	  constified.
+
 Sat Jul 12 16:02:31 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires

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

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