From: Kazu Hirata <kazu@codesourcery.com>
Date: Thu, 25 Jan 2007 15:40:22 +0000 (+0000)
Subject: 	* ar.c (print_contents, extract_file): Cast the return value
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84f1d8266b1db6ef286fefdfb99f6e14b65967d3;p=binutils-gdb.git

	* ar.c (print_contents, extract_file): Cast the return value
	of fwrite to size_t.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 13d20eb8186..5f99b214231 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-25  Kazu Hirata  <kazu@codesourcery.com>
+
+	* ar.c (print_contents, extract_file): Cast the return value
+	of fwrite to size_t.
+
 2007-01-12  Alan Modra  <amodra@bigpond.net.au>
 
 	* ar.c (open_inarch): Check fwrite return.  Use size_t.
diff --git a/binutils/ar.c b/binutils/ar.c
index 115224221e6..1fbacf9101a 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -805,7 +805,11 @@ print_contents (bfd *abfd)
 	/* xgettext:c-format */
 	fatal (_("%s is not a valid archive"),
 	       bfd_get_filename (bfd_my_archive (abfd)));
-      if (fwrite (cbuf, 1, nread, stdout) != nread)
+
+      /* fwrite in mingw32 may return int instead of size_t. Cast the
+	 return value to size_t to avoid comparison between signed and
+	 unsigned values.  */
+      if ((size_t) fwrite (cbuf, 1, nread, stdout) != nread)
 	fatal ("stdout: %s", strerror (errno));
       ncopied += tocopy;
     }
@@ -885,7 +889,11 @@ extract_file (bfd *abfd)
 
 	    output_file = ostream;
 	  }
-	if (fwrite (cbuf, 1, nread, ostream) != nread)
+
+	/* fwrite in mingw32 may return int instead of size_t. Cast
+	   the return value to size_t to avoid comparison between
+	   signed and unsigned values.  */
+	if ((size_t) fwrite (cbuf, 1, nread, ostream) != nread)
 	  fatal ("%s: %s", output_filename, strerror (errno));
 	ncopied += tocopy;
       }