From 7667c061fe798f99c3c7ffde1f330653e68c176b Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Tue, 2 Mar 2004 16:29:04 +0000 Subject: [PATCH] Simplified an expression (which was even wrong before) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6859 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/core/cbuf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kernel/core/cbuf.c b/src/kernel/core/cbuf.c index 861df14bbb..7871a5163c 100644 --- a/src/kernel/core/cbuf.c +++ b/src/kernel/core/cbuf.c @@ -441,7 +441,9 @@ cbuf_user_memcpy_to_chain(cbuf *chain, size_t offset, const void *_source, size_ return B_ERROR; } toCopy = min(length, buffer->length - bufferOffset); - if ((err = user_memcpy((char *)buffer->data + bufferOffset, source, toCopy) < 0)) + + err = user_memcpy((char *)buffer->data + bufferOffset, source, toCopy); + if (err < 0) break; // memory exception bufferOffset = 0; @@ -565,7 +567,9 @@ cbuf_user_memcpy_from_chain(void *_dest, cbuf *chain, size_t offset, size_t leng } toCopy = min(length, buffer->length - bufferOffset); - if ((err = user_memcpy(dest, (char *)buffer->data + bufferOffset, toCopy) < 0)) + + err = user_memcpy(dest, (char *)buffer->data + bufferOffset, toCopy); + if (err < 0) break; bufferOffset = 0;