summaryrefslogtreecommitdiff
path: root/lib/libz/deflate.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libz/deflate.c')
-rw-r--r--lib/libz/deflate.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/libz/deflate.c b/lib/libz/deflate.c
index cfa05059d3ff2..dc8c76c51372a 100644
--- a/lib/libz/deflate.c
+++ b/lib/libz/deflate.c
@@ -47,12 +47,12 @@
*
*/
-/* @(#) $Id: deflate.c,v 1.1.1.3 1999/01/10 09:46:53 peter Exp $ */
+/* $FreeBSD$ */
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly ";
+ " deflate 1.1.1 Copyright 1995-1998 Jean-loup Gailly ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -608,13 +608,11 @@ int ZEXPORT deflateCopy (dest, source)
deflate_state *ss;
ushf *overlay;
+ ss = source->state;
- if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+ if (source == Z_NULL || dest == Z_NULL || ss == Z_NULL) {
return Z_STREAM_ERROR;
}
-
- ss = source->state;
-
*dest = *source;
ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));