From 40fa4bb52dd49f7dd1c3485c995c3652697c78c6 Mon Sep 17 00:00:00 2001 From: Araq Date: Sat, 12 Nov 2011 02:10:07 +0100 Subject: better streams implemenation; fixes #63 --- lib/impure/zipfiles.nim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/impure') diff --git a/lib/impure/zipfiles.nim b/lib/impure/zipfiles.nim index 62fe210d2..bdefc2c93 100755 --- a/lib/impure/zipfiles.nim +++ b/lib/impure/zipfiles.nim @@ -75,10 +75,10 @@ proc mySourceCallback(state, data: pointer, len: int, var src = cast[PStream](state) case cmd of ZIP_SOURCE_OPEN: - if src.setPosition != nil: src.setPosition(src, 0) # reset + if src.setPositionImpl != nil: setPosition(src, 0) # reset of ZIP_SOURCE_READ: - result = src.readData(src, data, len) - of ZIP_SOURCE_CLOSE: src.close(src) + result = readData(src, data, len) + of ZIP_SOURCE_CLOSE: close(src) of ZIP_SOURCE_STAT: var stat = cast[PZipStat](data) zip_stat_init(stat) @@ -120,8 +120,8 @@ proc fsReadData(s: PStream, buffer: pointer, bufLen: int): int = proc newZipFileStream(f: PZipFile): PZipFileStream = new(result) result.f = f - result.close = fsClose - result.readData = fsReadData + result.closeImpl = fsClose + result.readDataImpl = fsReadData # other methods are nil! # ---------------------------------------------------------------------------- -- cgit 1.4.1-2-gfad0