2005-02-24 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* stream.c: (stream_read_try) Log a warning message if a fatal
I/O error occurs.
(stream_fifo_new) Fix prototype.
* stream.h: Fix prototype for stream_fifo_new (need void arg).
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 26cb686..ea56184 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-24 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+ * stream.c: (stream_read_try) Log a warning message if a fatal
+ I/O error occurs.
+ (stream_fifo_new) Fix prototype.
+ * stream.h: Fix prototype for stream_fifo_new (need void arg).
+
2005-02-23 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* {vty.h,vty.c}: Remove vty_finish (duplicate of vty_reset).
diff --git a/lib/stream.c b/lib/stream.c
index 821ad6e..b71b8ee 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -624,7 +624,10 @@
return nbytes;
}
/* Error: was it transient (return -2) or fatal (return -1)? */
- return ERRNO_IO_RETRY(errno) ? -2 : -1;
+ if (ERRNO_IO_RETRY(errno))
+ return -2;
+ zlog_warn("%s: read failed on fd %d: %s", __func__, fd, safe_strerror(errno));
+ return -1;
}
/* Read up to smaller of size or SIZE_REMAIN() bytes to the stream, starting
@@ -729,7 +732,7 @@
/* Stream first in first out queue. */
struct stream_fifo *
-stream_fifo_new ()
+stream_fifo_new (void)
{
struct stream_fifo *new;
diff --git a/lib/stream.h b/lib/stream.h
index 54a1674..1f6c377 100644
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -196,7 +196,7 @@
u_char *stream_pnt (struct stream *);
/* Stream fifo. */
-struct stream_fifo *stream_fifo_new ();
+struct stream_fifo *stream_fifo_new (void);
void stream_fifo_push (struct stream_fifo *fifo, struct stream *s);
struct stream *stream_fifo_pop (struct stream_fifo *fifo);
struct stream *stream_fifo_head (struct stream_fifo *fifo);