From 374b65289c258b2c33f6087b87b336dc5908b9d9 Mon Sep 17 00:00:00 2001 From: Radu Oana Date: Wed, 30 Sep 2015 08:20:24 -0400 Subject: [PATCH 1/2] Move magic numbers to const --- lib/pure/streams.nim | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/pure/streams.nim b/lib/pure/streams.nim index 68f31e9fea..88ac626a67 100644 --- a/lib/pure/streams.nim +++ b/lib/pure/streams.nim @@ -103,15 +103,16 @@ proc readData*(s: Stream, buffer: pointer, bufLen: int): int = proc readAll*(s: Stream): string = ## Reads all available data. - result = newString(1000) + let bufferSize = 1000 + result = newString(bufferSize) var r = 0 while true: - let readBytes = readData(s, addr(result[r]), 1000) - if readBytes < 1000: + let readBytes = readData(s, addr(result[r]), bufferSize) + if readBytes < bufferSize: setLen(result, r+readBytes) break - inc r, 1000 - setLen(result, r+1000) + inc r, bufferSize + setLen(result, r+bufferSize) proc readData*(s, unused: Stream, buffer: pointer, bufLen: int): int {.deprecated.} = From 4bba8e026a266dd7ab0622ce580b517078516cd9 Mon Sep 17 00:00:00 2001 From: Radu Oana Date: Wed, 30 Sep 2015 09:49:22 -0400 Subject: [PATCH 2/2] use const instead of let --- lib/pure/streams.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pure/streams.nim b/lib/pure/streams.nim index 88ac626a67..38e91fee48 100644 --- a/lib/pure/streams.nim +++ b/lib/pure/streams.nim @@ -103,7 +103,7 @@ proc readData*(s: Stream, buffer: pointer, bufLen: int): int = proc readAll*(s: Stream): string = ## Reads all available data. - let bufferSize = 1000 + const bufferSize = 1000 result = newString(bufferSize) var r = 0 while true: