From 82d138f749e150955db443f56eacaaedd010191b Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 29 Nov 2011 00:58:28 +0000 Subject: [PATCH] * io.c (rb_write_error2): suppress unused variable warning. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++-- io.c | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90fd4c1d3b..94096c866e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Nov 29 09:58:23 2011 Nobuyoshi Nakada + + * io.c (rb_write_error2): suppress unused variable warning. + Tue Nov 29 07:45:26 2011 Eric Hodel * lib/mkmf.rb: Wrap comments to 78 columns and clean up formatting. @@ -12,11 +16,11 @@ Tue Nov 29 05:54:18 2011 Eric Hodel Tue Nov 29 00:08:57 2011 Yuki Sonoda (Yugui) * 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 , patch by George Koehler . diff --git a/io.c b/io.c index 2c4b01dc11..07eddd3146 100644 --- a/io.c +++ b/io.c @@ -6599,8 +6599,10 @@ void rb_write_error2(const char *mesg, long len) { if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) { - ssize_t unused; - unused = fwrite(mesg, sizeof(char), len, stderr); + if (fwrite(mesg, sizeof(char), (size_t)len, stderr) < (size_t)len) { + /* failed to write to stderr, what can we do? */ + return; + } } else { rb_io_write(rb_stderr, rb_str_new(mesg, len));