Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 29 May 2009 19:50:04 +0000 (UTC)
From:      Kip Macy <kmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r193058 - in user/kmacy/releng_7_2_fcs/sys: cddl/contrib/opensolaris/uts/common/zmod kern net
Message-ID:  <200905291950.n4TJo4X2084953@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kmacy
Date: Fri May 29 19:50:03 2009
New Revision: 193058
URL: http://svn.freebsd.org/changeset/base/193058

Log:
  retire redundant compression functionality

Deleted:
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c
  user/kmacy/releng_7_2_fcs/sys/kern/inflate.c
  user/kmacy/releng_7_2_fcs/sys/net/zlib.c
  user/kmacy/releng_7_2_fcs/sys/net/zlib.h
Modified:
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c

Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c	Fri May 29 19:49:34 2009	(r193057)
+++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c	Fri May 29 19:50:03 2009	(r193058)
@@ -30,43 +30,6 @@
 #include "zlib.h"
 #include "zutil.h"
 
-/*
- * Uncompress the buffer 'src' into the buffer 'dst'.  The caller must store
- * the expected decompressed data size externally so it can be passed in.
- * The resulting decompressed size is then returned through dstlen.  This
- * function return Z_OK on success, or another error code on failure.
- */
-#if 0
-int
-z_uncompress(void *dst, size_t *dstlen, const void *src, size_t srclen)
-{
-	z_stream zs;
-	int err;
-
-	bzero(&zs, sizeof (zs));
-	zs.next_in = (uchar_t *)src;
-	zs.avail_in = srclen;
-	zs.next_out = dst;
-	zs.avail_out = *dstlen;
-
-	/*
-	 * Call inflateInit2() specifying a window size of DEF_WBITS
-	 * with the 6th bit set to indicate that the compression format
-	 * type (zlib or gzip) should be automatically detected.
-	 */
-	if ((err = inflateInit2(&zs, DEF_WBITS | 0x20)) != Z_OK)
-		return (err);
-
-	if ((err = inflate(&zs, Z_FINISH)) != Z_STREAM_END) {
-		(void) inflateEnd(&zs);
-		return (err == Z_OK ? Z_BUF_ERROR : err);
-	}
-
-	*dstlen = zs.total_out;
-	return (inflateEnd(&zs));
-}
-#endif
-
 int
 z_compress_level(void *dst, size_t *dstlen, const void *src, size_t srclen,
     int level)
@@ -106,12 +69,3 @@ z_strerror(int err)
 
 	return (zError(err));
 }
-
-#if 0
-int
-z_compress(void *dst, size_t *dstlen, const void *src, size_t srclen)
-{
-	return (z_compress_level(dst, dstlen, src, srclen,
-	    Z_DEFAULT_COMPRESSION));
-}
-#endif

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905291950.n4TJo4X2084953>