diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | string.c | 6 | ||||
| -rw-r--r-- | thread_pthread.c | 6 |
3 files changed, 10 insertions, 10 deletions
@@ -50,11 +50,11 @@ Mon Feb 6 15:01:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Feb 6 21:52:20 2012 Yuki Sonoda (Yugui) <yugui@yugui.jp> * common.mk (INSTRUBY_ARGS): added --mantype to apply mdoc2man.rb - to man pages. Fixes #5598. + to man pages. Fixes #5598. (do-install-nodoc, do-install-local, do-install-man, dont-install-nodoc, dont-install-local, dont-install-man): No longer needs --mantype. - + Reported by Rainer Orth <ro AT cebitec.uni-bielefeld.de>, patch by George Koehler <xkernigh AT netscape.net>. @@ -728,11 +728,11 @@ Tue Aug 30 09:53:59 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Tue Aug 30 09:52:29 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * backport r33117 from trunk. - + * thread.c (rb_thread_select): rewrite by using rb_thread_fd_select(). old one is EINTR unsafe. Patch by Eric Wong. [Bug #5229] [ruby-core:39102] - + * test/-ext-/old_thread_select/test_old_thread_select.rb: a testcase for rb_thread_select(). * ext/-test-/old_thread_select/old_thread_select.c: ditto. @@ -5233,14 +5233,14 @@ rb_str_tr_bang(VALUE str, VALUE src, VALUE repl) * call-seq: * str.tr(from_str, to_str) => new_str * - * Returns a copy of <i>str</i> with the characters in <i>from_str</i> - * replaced by the corresponding characters in <i>to_str</i>. If + * Returns a copy of <i>str</i> with the characters in <i>from_str</i> + * replaced by the corresponding characters in <i>to_str</i>. If * <i>to_str</i> is shorter than <i>from_str</i>, it is padded with its last * character in order to maintain the correspondence. * * "hello".tr('el', 'ip') #=> "hippo" * "hello".tr('aeiou', '*') #=> "h*ll*" - * + * * Both strings may use the c1-c2 notation to denote ranges of characters, * and <i>from_str</i> may start with a <code>^</code>, which denotes all * characters except those listed. diff --git a/thread_pthread.c b/thread_pthread.c index c6c98f0f2c..38f968e5a1 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1088,7 +1088,7 @@ consume_communication_pipe(void) { #define CCP_READ_BUFF_SIZE 1024 /* buffer can be shared because no one refers to them. */ - static char buff[CCP_READ_BUFF_SIZE]; + static char buff[CCP_READ_BUFF_SIZE]; ssize_t result; retry: @@ -1148,11 +1148,11 @@ thread_timer(void *p) timeout.tv_usec = TIME_QUANTUM_USEC; /* polling (TIME_QUANTUM_USEC usec) */ - result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, &timeout); + result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, &timeout); } else { /* wait (infinite) */ - result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, 0); + result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, 0); } if (result == 0) { |