Sorter: Ah, fixed wrong include of time.h.

[libucw.git] / ucw / main-rec.c

diff --git a/ucw/main-rec.c b/ucw/main-rec.c
index d282b53fd8decf7845b96a25fd9a1f937e19942b..ca313187fdf905490bb498035bff01b7d5e7a1a5 100644 (file)
--- a/ucw/main-rec.c
+++ b/ucw/main-rec.c
@@ -1,7 +1,7 @@
 /*
  *     UCW Library -- Main Loop: Record I/O
  *
 /*
  *     UCW Library -- Main Loop: Record I/O
  *

- *     (c) 2011 Martin Mares <mj@ucw.cz>
+ *     (c) 2011--2012 Martin Mares <mj@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.


@@ -9,8 +9,8 @@
 
 #undef LOCAL_DEBUG
 
 
 #undef LOCAL_DEBUG
 

-#include "ucw/lib.h"
-#include "ucw/mainloop.h"
+#include <ucw/lib.h>
+#include <ucw/mainloop.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -51,9 +51,11 @@ rec_io_add(struct main_rec_io *rio, int fd)
 void
 rec_io_del(struct main_rec_io *rio)
 {
 void
 rec_io_del(struct main_rec_io *rio)
 {

+  if (!rec_io_is_active(rio))
+    return;
+

   timer_del(&rio->timer);
   timer_del(&rio->timer);

-  if (hook_is_active(&rio->start_read_hook))
-    hook_del(&rio->start_read_hook);
+  hook_del(&rio->start_read_hook);

   file_del(&rio->file);
 
   if (rio->read_buf)
   file_del(&rio->file);
 
   if (rio->read_buf)


@@ -239,7 +241,8 @@ static void
 rec_io_stop_write(struct main_rec_io *rio)
 {
   DBG("RIO WRITE: Stopping write");
 rec_io_stop_write(struct main_rec_io *rio)
 {
   DBG("RIO WRITE: Stopping write");

-  ASSERT(!rio->write_watermark);
+  // XXX: When we are called after a write error, there might still
+  // be some data queued, but we need not care.

   rio->file.write_handler = NULL;
   file_chg(&rio->file);
 }
   rio->file.write_handler = NULL;
   file_chg(&rio->file);
 }