[Cvs-cvs] ccvs/src ChangeLog buffer.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/20 20:32:27

Modified files:
        src            : ChangeLog buffer.c 

Log message:
        * buffer.c (fd_buffer_input, fd_buffer_output): Assert error return
        value is non-zero.  Assert byte count is as expected.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3374&tr2=1.3375&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/buffer.c.diff?tr1=1.69&tr2=1.70&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3374 ccvs/src/ChangeLog:1.3375
--- ccvs/src/ChangeLog:1.3374   Thu Apr 20 19:45:40 2006
+++ ccvs/src/ChangeLog  Thu Apr 20 20:32:27 2006
@@ -1,5 +1,8 @@
 2006-04-20  Derek Price  <address@hidden>
 
+       * buffer.c (fd_buffer_input, fd_buffer_output): Assert error return
+       value is non-zero.  Assert byte count is as expected.
+
        * buffer.c (fd_buffer_input, fd_buffer_output): Negative return values
        from read and write are never byte counts.
 
Index: ccvs/src/buffer.c
diff -u ccvs/src/buffer.c:1.69 ccvs/src/buffer.c:1.70
--- ccvs/src/buffer.c:1.69      Thu Apr 20 19:45:40 2006
+++ ccvs/src/buffer.c   Thu Apr 20 20:32:27 2006
@@ -1854,6 +1854,7 @@
                if (numfds < 0 && errno != EINTR)
                {
                    status = errno;
+                   assert (status);
                    goto block_done;
                }
                else if (numfds == 0)
@@ -1876,13 +1877,13 @@
                     * on the fact that we will read EOF again next time.
                     */
                    status = 0;
-                   break;
+                   goto block_done;
                }
                else
                {
                    /* Return EOF.  */
                    status = -1;
-                   break;
+                   goto block_done;
                }
            }
 
@@ -1892,7 +1893,8 @@
                if (!blocking_error (errno))
                {
                    status = errno;
-                   break;
+                   assert (status);
+                   goto block_done;
                }
                /* else Everything's fine, we just didn't get any data.  */
            }
@@ -1981,6 +1983,7 @@
                if (numfds < 0 && errno != EINTR)
                {
                    status = errno;
+                   assert (status);
                    goto block_done;
                }
                else if (numfds == 0)
@@ -1998,6 +2001,7 @@
                if (!blocking_error (errno))
                {
                    status = errno;
+                   assert (status);
                    goto block_done;
                }
                /* else Everything's fine, we just didn't get any data.  */
@@ -2005,6 +2009,7 @@
            else
                *wrote += nbytes;
        } while (*wrote < have);
+       assert (*wrote == have);
 
 block_done:
        if (status == 0)