Changeset 7ae249d in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2011-07-29T14:47:52Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

00c2de63, 1814ee4d, ffff746

Parents:

9350bfdd (diff), f5d51de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

File:

• uspace/lib/c/generic/io/io.c (modified) (2 diffs)

uspace/lib/c/generic/io/io.c

@@ -594 +594 @@
                 }
                 
-                buf += now;
+                data += now;
                 stream->buf_head += now;
                 buf_free -= now;
                 bytes_left -= now;
                 total_written += now;
+                stream->buf_state = _bs_write;
                 
                 if (buf_free == 0) {
@@ -606 +607 @@
                 }
         }
-        
-        if (total_written > 0)
-                stream->buf_state = _bs_write;
 
         if (need_flush)