diff options
| author | kientzle <kientzle@FreeBSD.org> | 2005-05-11 03:47:48 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2005-05-11 03:47:48 +0000 |
| commit | 2f1311730e491ca59294adde890462dadbeb3993 (patch) | |
| tree | 3456c8a5a45eb53dd1ef5c3ec9bebb4b2ab74c3c /lib/libz/trees.c | |
| parent | 3f1dd047fb33cff02eb05f7dd92b73a4b805a5ea (diff) | |
| download | FreeBSD-src-2f1311730e491ca59294adde890462dadbeb3993.zip FreeBSD-src-2f1311730e491ca59294adde890462dadbeb3993.tar.gz | |
Since the FreeBSD local modifications are mostly trivial (consisting
primarily of pointless $FreeBSD$ tags), sync most files in HEAD with
those in the ZLIB branch. This minimizes the differences between
HEAD and ZLIB and should simplify future imports.
After this, there are only three files with local modifications
(gzio.c, minigzip.c, and zconf.h) and two non-vendor files
(Makefile, zopen.c). The rest exactly match the vendor distribution.
PR: i386/76294
MFC after: 2 weeks
Diffstat (limited to 'lib/libz/trees.c')
| -rw-r--r-- | lib/libz/trees.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libz/trees.c b/lib/libz/trees.c index 3f8289f..52c820f 100644 --- a/lib/libz/trees.c +++ b/lib/libz/trees.c @@ -29,8 +29,7 @@ * Addison-Wesley, 1983. ISBN 0-201-06672-6. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); +/* @(#) $Id$ */ /* #define GEN_TREES_H */ @@ -932,7 +931,7 @@ void _tr_flush_block(s, buf, stored_len, eof) if (s->level > 0) { /* Check if the file is ascii or binary */ - if (s->data_type == Z_UNKNOWN) set_data_type(s); + if (s->strm->data_type == Z_UNKNOWN) set_data_type(s); /* Construct the literal and distance trees */ build_tree(s, (tree_desc *)(&(s->l_desc))); @@ -1132,7 +1131,7 @@ local void set_data_type(s) while (n < 7) bin_freq += s->dyn_ltree[n++].Freq; while (n < 128) ascii_freq += s->dyn_ltree[n++].Freq; while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq; - s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII); + s->strm->data_type = bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII; } /* =========================================================================== |
