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

ruby-changes:21822

From: kosaki <ko1@a...>
Date: Sun, 27 Nov 2011 21:06:21 +0900 (JST)
Subject: [ruby-changes:21822] kosaki:r33871 (trunk): * io.c (rb_write_error2): get rid of warning on linux. fwrite

kosaki	2011-11-27 21:06:10 +0900 (Sun, 27 Nov 2011)

  New Revision: 33871

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

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/io.c
    trunk/vm_dump.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33870)
+++ ChangeLog	(revision 33871)
@@ -1,3 +1,10 @@
+Sun Nov 27 20:58:02 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* 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@r...>
 
 	* configure.in (stack_protector): disable on mingw.  [Bug#5676]
Index: io.c
===================================================================
--- io.c	(revision 33870)
+++ io.c	(revision 33871)
@@ -6596,7 +6596,8 @@
 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));
Index: vm_dump.c
===================================================================
--- vm_dump.c	(revision 33870)
+++ vm_dump.c	(revision 33871)
@@ -863,7 +863,8 @@
 		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);

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

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