Revert "AsyncInputStream: fix assertion failure in AppendToBuffer()"

This reverts commit 966c4244. The commit was bad, because the bug was really in NfsInputStream::DoRead(); see previous commit.

Revert "AsyncInputStream: fix assertion failure in AppendToBuffer()"
a877926f · Max Kellermann · 3e4e6f7c · a877926f
Commit a877926f authored Jun 21, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

AsyncInputStream.cxx src/input/AsyncInputStream.cxx +4 -6

No files found.
--- a/src/input/AsyncInputStream.cxx
+++ b/src/input/AsyncInputStream.cxx
@@ -222,13 +222,11 @@ AsyncInputStream::AppendToBuffer(const void *data, size_t append_size)
 	const size_t remaining = append_size - nbytes;
 	if (remaining > 0) {
 		w = buffer.Write();
+		assert(!w.IsEmpty());
+		assert(w.size >= remaining);

-		if (!w.IsEmpty()) {
-			size_t nbytes2 = std::min(w.size, remaining);
-			memcpy(w.data, (const uint8_t *)data + nbytes,
-			       nbytes2);
-			buffer.Append(nbytes2);
-		}
+		memcpy(w.data, (const uint8_t *)data + nbytes, remaining);
+		buffer.Append(remaining);
 	}

 	if (!IsReady())