2005-02-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* watchquagga.c: (handle_read) Use new ERRNO_IO_RETRY macro.

diff --git a/watchquagga/ChangeLog b/watchquagga/ChangeLog
index 79261c26a66be8932f0331cbdb8657765605cb88..7baf4b7cd3e5a72bd2e8052f55743e7a9fb0cd57 100644 (file)
--- a/watchquagga/ChangeLog
+++ b/watchquagga/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * watchquagga.c: (handle_read) Use new ERRNO_IO_RETRY macro.
+
 2005-02-16 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * watchquagga.c: (try_connect) Use new set_nonblocking function instead

diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index cde21b9936ba6a72354661d76c06d45321bc6782..f49cb92775cb821df35bbe2a9137e314236b9ca0 100644 (file)
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1,5 +1,5 @@
 /*
-    $Id: watchquagga.c,v 1.10 2005/02/16 20:40:25 ajs Exp $
+    $Id: watchquagga.c,v 1.11 2005/02/17 20:11:58 ajs Exp $
 
     Monitor status of quagga daemons and restart if necessary.
 
@@ -609,7 +609,7 @@ handle_read(struct thread *t_read)
     {
       char why[100];
 
-      if ((errno == EINTR) || (errno == EAGAIN))
+      if (ERRNO_IO_RETRY(errno))
        {
          /* Pretend it never happened. */
          SET_READ_HANDLER(dmn);