summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-27 12:06:10 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-27 12:06:10 +0000
commit8cee31214df54281a93c8fe135a5fd36fd7e288a (patch)
treec9cbea25ec37f42d53ddd34541fd254132c6f684
parent9b58c2edf3dbb9adc4355e642e4124eeb47a43d5 (diff)
* io.c (rb_write_error2): get rid of warning on linux. fwrite
of glibc is tagged __attribute__ ((__warn_unused_result__)) if _FORTIFY_SOURCE != 0. * vm_dump.c (rb_vm_bugreport): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--io.c3
-rw-r--r--vm_dump.c3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 00f04dd026..95723fc20d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Nov 27 20:58:02 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * io.c (rb_write_error2): get rid of warning on linux. fwrite
+ of glibc is tagged __attribute__ ((__warn_unused_result__))
+ if _FORTIFY_SOURCE != 0.
+ * vm_dump.c (rb_vm_bugreport): ditto.
+
Sun Nov 27 19:09:02 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (stack_protector): disable on mingw. [Bug#5676]
diff --git a/io.c b/io.c
index 1a3e7523ef..3a0ba43097 100644
--- a/io.c
+++ b/io.c
@@ -6596,7 +6596,8 @@ void
rb_write_error2(const char *mesg, long len)
{
if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
- (void)fwrite(mesg, sizeof(char), len, stderr);
+ int unused;
+ unused = fwrite(mesg, sizeof(char), len, stderr);
}
else {
rb_io_write(rb_stderr, rb_str_new(mesg, len));
diff --git a/vm_dump.c b/vm_dump.c
index 1e59919e29..2ace3a5921 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -863,7 +863,8 @@ rb_vm_bugreport(void)
while (!feof(fp)) {
char buff[0x100];
size_t rn = fread(buff, 1, 0x100, fp);
- fwrite(buff, 1, rn, stderr);
+ if (fwrite(buff, 1, rn, stderr) != rn)
+ break;
}
fclose(fp);