From 8cce67184345ae550d224ed2382f9aa65ac54c8a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Thu, 20 Dec 2007 21:26:17 +0000
Subject: Fix buglet in last patch.

---
 gold/fileread.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'gold')

diff --git a/gold/fileread.cc b/gold/fileread.cc
index 31f48a4..baa681a 100644
--- a/gold/fileread.cc
+++ b/gold/fileread.cc
@@ -208,11 +208,11 @@ File_read::find_view(off_t start, section_size_type size) const
 void
 File_read::do_read(off_t start, section_size_type size, void* p) const
 {
-  section_size_type bytes;
+  ssize_t bytes;
   if (this->contents_ != NULL)
     {
       bytes = this->size_ - start;
-      if (bytes >= size)
+      if (static_cast<section_size_type>(bytes) >= size)
 	{
 	  memcpy(p, this->contents_ + start, size);
 	  return;
@@ -220,16 +220,16 @@ File_read::do_read(off_t start, section_size_type size, void* p) const
     }
   else
     {
-      ssize_t got = ::pread(this->descriptor_, p, size, start);
-      if (got < 0)
+      bytes = ::pread(this->descriptor_, p, size, start);
+      if (static_cast<section_size_type>(bytes) == size)
+	return;
+
+      if (bytes < 0)
 	{
 	  gold_fatal(_("%s: pread failed: %s"),
 		     this->filename().c_str(), strerror(errno));
 	  return;
 	}
-
-      if (static_cast<section_size_type>(got) == size)
-	return;
     }
 
   gold_fatal(_("%s: file too short: read only %lld of %lld bytes at %lld"),
-- 
cgit v1.1