From 22103b96af37a8e7a4a3782c1ae660f02dd1a177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Fri, 22 Nov 1996 16:09:58 -0800
Subject: [PATCH] zlibmod now works
Rev: src/modules/zlibmod/testsuite.in:1.3
Rev: src/modules/zlibmod/zlibmod.c:1.2
---
src/modules/zlibmod/testsuite.in | 12 ++++++++++++
src/modules/zlibmod/zlibmod.c | 12 ++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/modules/zlibmod/testsuite.in b/src/modules/zlibmod/testsuite.in
index 9b138fb7ec..fdc03eb7f7 100644
--- a/src/modules/zlibmod/testsuite.in
+++ b/src/modules/zlibmod/testsuite.in
@@ -1,5 +1,17 @@
cond([[ master()->programs["/precompiled/gz_inflate"] ]],
[[
test_true(Gz_deflate())
+ test_true(Gz_deflate()->deflate)
test_true(Gz_inflate())
+ test_true(Gz_inflate()->inflate)
+define(dotest,[[
+ test_true(Gz_deflate(1)->deflate($1))
+ test_eq(Gz_inflate()->inflate(Gz_deflate(1)->deflate($1)),$1)
+ test_eq(Gz_inflate()->inflate(Gz_deflate(9)->deflate($1)),$1)
+ test_any([[object o=Gz_deflate(); return Gz_inflate()->inflate(o->deflate($1,o->PARTIAL_FLUSH) + o->deflate($1,o->FINISH))]], [[($1)+($1)]])
+]])
+ dotest("")
+ dotest("foo")
+ dotest(sprintf("%'fomp'1000n"))
+ dotest(sprintf("%'fomp'100000n"))
]])
diff --git a/src/modules/zlibmod/zlibmod.c b/src/modules/zlibmod/zlibmod.c
index 1fb6207c42..00eae602cf 100644
--- a/src/modules/zlibmod/zlibmod.c
+++ b/src/modules/zlibmod/zlibmod.c
@@ -4,7 +4,7 @@
||| See the files COPYING and DISCLAIMER for more information.
\*/
#include "global.h"
-RCSID("$Id: zlibmod.c,v 1.1 1996/11/16 05:17:15 hubbe Exp $");
+RCSID("$Id: zlibmod.c,v 1.2 1996/11/23 00:09:58 hubbe Exp $");
#include "zlib_machine.h"
#include "types.h"
@@ -159,7 +159,7 @@ static void gz_deflate(INT32 args)
error("Argument 2 to gz_deflate->deflate() out of range.\n");
}
}else{
- flush=Z_NO_FLUSH;
+ flush=Z_FINISH;
}
this->gz.next_in=(Bytef *)data->str;
@@ -203,7 +203,7 @@ static void exit_gz_deflate(struct object *o)
static void gz_inflate_create(INT32 args)
{
- int level;
+ int tmp;
if(THIS->gz.state)
{
mt_lock(this->lock);
@@ -218,9 +218,9 @@ static void gz_inflate_create(INT32 args)
pop_n_elems(args);
mt_lock(THIS->lock);
- level=inflateInit(& THIS->gz);
+ tmp=inflateInit(& THIS->gz);
mt_unlock(THIS->lock);
- switch(level)
+ switch(tmp)
{
case Z_OK:
return;
@@ -305,7 +305,7 @@ static void gz_inflate(INT32 args)
error("Error in gz_inflate->inflate(): %d\n",fail);
}
push_string(low_free_buf(&buf));
- if(fail == Z_STREAM_END && !sp[-1].u.string->len)
+ if(fail != Z_STREAM_END && fail!=Z_OK && !sp[-1].u.string->len)
{
pop_stack();
push_int(0);
--
GitLab