From 4493008e7ada12be917414523efe73d3582d23e8 Mon Sep 17 00:00:00 2001 From: Charles Cooper Date: Wed, 1 Apr 2015 12:13:09 -0700 Subject: [PATCH] style suggestions --- std/stdio.d | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/std/stdio.d b/std/stdio.d index a58535811c5..dbd758a7e20 100644 --- a/std/stdio.d +++ b/std/stdio.d @@ -742,13 +742,15 @@ $(D rawRead) always reads in binary mode on Windows. scope(exit) __fhnd_info[fd] = info; } } - immutable fread_result = + immutable freadResult = fread(buffer.ptr, T.sizeof, buffer.length, _p.handle); - immutable fread_success = (fread_result == buffer.length); - if (fread_success) - return buffer; - errnoEnforce(!error); - return buffer[0 .. fread_result]; + assert (freadResult <= buffer.length); // fread return guarantee + if (freadResult != buffer.length) // error or eof + { + errnoEnforce(!error); + return buffer[0 .. freadResult]; + } + return buffer; } unittest