svn commit: r193067 - user/kmacy/releng_7_2_fcs/sys/libkern/zlib

[Kip Macy]

Author: kmacy
Date: Fri May 29 21:31:44 2009
New Revision: 193067
URL: http://svn.freebsd.org/changeset/base/193067

Log:
  remove unused crc32.c
  fix DEBUG compile for INVARIANTS

Deleted:
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/crc32.c
Modified:
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/deflate.c
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/inflate.c
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/trees.c
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zl_crc32.c
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/deflate.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/deflate.c	Fri May 29 21:27:12 2009	(r193066)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/deflate.c	Fri May 29 21:31:44 2009	(r193067)
@@ -1225,7 +1225,7 @@ local uInt longest_match_fast(s, cur_mat
     return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
 }
 
-#ifdef DEBUG
+#if 0
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/inflate.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/inflate.c	Fri May 29 21:27:12 2009	(r193066)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/inflate.c	Fri May 29 21:31:44 2009	(r193067)
@@ -245,7 +245,7 @@ struct inflate_state FAR *state;
     state->distbits = 5;
 }
 
-#ifdef MAKEFIXED
+#if 0
 #include <stdio.h>
 
 /*

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/trees.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/trees.c	Fri May 29 21:27:12 2009	(r193066)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/trees.c	Fri May 29 21:31:44 2009	(r193067)
@@ -35,9 +35,6 @@
 
 #include <libkern/zlib/deflate.h>
 
-#ifdef DEBUG
-#  include <ctype.h>
-#endif
 
 /* ===========================================================================
  * Constants
@@ -163,7 +160,7 @@ local void copy_block     OF((deflate_st
 local void gen_trees_header OF((void));
 #endif
 
-#ifndef DEBUG
+#if 1
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
    /* Send a code of the given tree. c and tree must not have side effects */
 
@@ -318,7 +315,7 @@ local void tr_static_init()
 /* ===========================================================================
  * Genererate the file trees.h describing the static trees.
  */
-#ifdef GEN_TREES_H
+#if 0
 #  ifndef DEBUG
 #    include <stdio.h>
 #  endif

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zl_crc32.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zl_crc32.c	Fri May 29 21:27:12 2009	(r193066)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zl_crc32.c	Fri May 29 21:31:44 2009	(r193067)
@@ -22,7 +22,7 @@
   one thread to use crc32().
  */
 
-#ifdef MAKECRCH
+#if 0
 #  include <stdio.h>
 #  ifndef DYNAMIC_CRC_TABLE
 #    define DYNAMIC_CRC_TABLE

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c	Fri May 29 21:27:12 2009	(r193066)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c	Fri May 29 21:31:44 2009	(r193067)
@@ -112,7 +112,7 @@ uLong ZEXPORT zlibCompileFlags()
     return flags;
 }
 
-#ifdef DEBUG
+#if 0
 
 #  ifndef verbose
 #    define verbose 0

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h	Fri May 29 21:27:12 2009	(r193066)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h	Fri May 29 21:31:44 2009	(r193067)
@@ -243,7 +243,7 @@ extern const char * const z_errmsg[10]; 
 #endif
 
 /* Diagnostic functions */
-#ifdef DEBUG
+#if 0
 #  include <stdio.h>
    extern int z_verbose;
    extern void z_error    OF((char *m));