Fix gcc 4.3 warning in directory_watcher_inotify.cc

base/directory_watcher_inotify.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/directory_watcher.h"
 
 #include <errno.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/inotify.h>
@@ skipping 168 matching lines @@
   shutdown_pipe_[1] = -1;
   if (inotify_fd_ >= 0 && pipe(shutdown_pipe_) == 0 && thread_.Start()) {
     thread_.message_loop()->PostTask(
         FROM_HERE, new InotifyReaderTask(this, inotify_fd_, shutdown_pipe_[0]));
     valid_ = true;
   }
 }
 
 InotifyReader::~InotifyReader() {
   if (valid_) {
-    // Write to the self-pipe so that the select call in InotifyReaderTask returns.
-    write(shutdown_pipe_[1], "", 1);
+    // Write to the self-pipe so that the select call in InotifyReaderTask
+    // returns.
+    ssize_t bytes_written;
+    do {
+      bytes_written = write(shutdown_pipe_[1], "", 1);
+      if (bytes_written == 0)
+        continue;
+    } while (bytes_written == -1 && errno == EINTR);
     thread_.Stop();

[Mark Mentovai, 2009/03/19 19:01:57]

You can keep the DCHECK that you had in the last version, or update the
changelist description to remove the mention of DCHECK.

I think the DCHECK was fine but I also don't mind if you want to get rid of it.

   }
   if (inotify_fd_ >= 0)
     close(inotify_fd_);
   if (shutdown_pipe_[0] >= 0)
     close(shutdown_pipe_[0]);
   if (shutdown_pipe_[1] >= 0)
     close(shutdown_pipe_[1]);
 }
 
 InotifyReader::Watch InotifyReader::AddWatch(
@@ skipping 110 matching lines @@
   watch_ = Singleton<InotifyReader>::get()->AddWatch(path, delegate_);
 
   return watch_ != InotifyReader::kInvalidWatch;
 }
 
 }  // namespace
 
 DirectoryWatcher::DirectoryWatcher() {
   impl_ = new DirectoryWatcherImpl();
 }