Commit 87c2ce3b authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] lib/zlib*: cleanups 



This patch contains the following possible cleanups:
- #if 0 the following unused functions:
  - zlib_deflate/deflate.c: zlib_deflateSetDictionary
  - zlib_deflate/deflate.c: zlib_deflateParams
  - zlib_deflate/deflate.c: zlib_deflateCopy
  - zlib_inflate/infblock.c: zlib_inflate_set_dictionary
  - zlib_inflate/infblock.c: zlib_inflate_blocks_sync_point
  - zlib_inflate/inflate_sync.c: zlib_inflateSync
  - zlib_inflate/inflate_sync.c: zlib_inflateSyncPoint
- remove the following unneeded EXPORT_SYMBOL's:
  - zlib_deflate/deflate_syms.c: zlib_deflateCopy
  - zlib_deflate/deflate_syms.c: zlib_deflateParams
  - zlib_inflate/inflate_syms.c: zlib_inflateSync
  - zlib_inflate/inflate_syms.c: zlib_inflateSyncPoint

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Matt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3af13763

include/linux/zlib.h

+11 −0
Original line number Diff line number Diff line
@@ -442,9 +442,11 @@ extern int deflateInit2 (z_streamp strm, 
   not perform any compression: this will be done by deflate().

*/

                            

#if 0

extern int zlib_deflateSetDictionary (z_streamp strm,

						     const Byte *dictionary,

						     uInt  dictLength);

#endif

/*

     Initializes the compression dictionary from the given byte sequence

   without producing any compressed output. This function must be called
@@ -478,7 +480,10 @@ extern int zlib_deflateSetDictionary (z_streamp strm, 
   perform any compression: this will be done by deflate().

*/



#if 0

extern int zlib_deflateCopy (z_streamp dest, z_streamp source);

#endif



/*

     Sets the destination stream as a complete copy of the source stream.
@@ -511,7 +516,9 @@ static inline unsigned long deflateBound(unsigned long s) 
	return s + ((s + 7) >> 3) + ((s + 63) >> 6) + 11;

}



#if 0

extern int zlib_deflateParams (z_streamp strm, int level, int strategy);

#endif

/*

     Dynamically update the compression level and compression strategy.  The

   interpretation of level and strategy is as in deflateInit2.  This can be
@@ -571,7 +578,9 @@ extern int zlib_inflateSetDictionary (z_streamp strm, 
   inflate().

*/



#if 0

extern int zlib_inflateSync (z_streamp strm);

#endif

/* 

    Skips invalid compressed data until a full flush point (see above the

  description of deflate with Z_FULL_FLUSH) can be found, or until all
@@ -636,7 +645,9 @@ extern int zlib_inflateInit2_ (z_streamp strm, int windowBits, 
#endif



extern const char  * zlib_zError           (int err);

#if 0

extern int           zlib_inflateSyncPoint (z_streamp z);

#endif

extern const uLong * zlib_get_crc_table    (void);



#endif /* _ZLIB_H */

lib/zlib_deflate/deflate.c

+6 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ int zlib_deflateInit2_( 
}



/* ========================================================================= */

#if 0

int zlib_deflateSetDictionary(

	z_streamp strm,

	const Byte *dictionary,
@@ -297,6 +298,7 @@ int zlib_deflateSetDictionary( 
    if (hash_head) hash_head = 0;  /* to make compiler happy */

    return Z_OK;

}

#endif  /*  0  */



/* ========================================================================= */

int zlib_deflateReset(
@@ -330,6 +332,7 @@ int zlib_deflateReset( 
}



/* ========================================================================= */

#if 0

int zlib_deflateParams(

	z_streamp strm,

	int level,
@@ -365,6 +368,7 @@ int zlib_deflateParams( 
    s->strategy = strategy;

    return err;

}

#endif  /*  0  */



/* =========================================================================

 * Put a short in the pending buffer. The 16-bit value is put in MSB order.
@@ -572,6 +576,7 @@ int zlib_deflateEnd( 
/* =========================================================================

 * Copy the source state to the destination state.

 */

#if 0

int zlib_deflateCopy (

	z_streamp dest,

	z_streamp source
@@ -624,6 +629,7 @@ int zlib_deflateCopy ( 
    return Z_OK;

#endif

}

#endif  /*  0  */



/* ===========================================================================

 * Read a new buffer from the current input stream, update the adler32

lib/zlib_deflate/deflate_syms.c

+0 −2
Original line number Diff line number Diff line
@@ -16,6 +16,4 @@ EXPORT_SYMBOL(zlib_deflateInit_); 
EXPORT_SYMBOL(zlib_deflateInit2_);

EXPORT_SYMBOL(zlib_deflateEnd);

EXPORT_SYMBOL(zlib_deflateReset);

EXPORT_SYMBOL(zlib_deflateCopy);

EXPORT_SYMBOL(zlib_deflateParams);

MODULE_LICENSE("GPL");

lib/zlib_inflate/infblock.c

+4 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ int zlib_inflate_blocks_free( 
}





#if 0

void zlib_inflate_set_dictionary(

	inflate_blocks_statef *s,

	const Byte *d,
@@ -347,15 +348,18 @@ void zlib_inflate_set_dictionary( 
  memcpy(s->window, d, n);

  s->read = s->write = s->window + n;

}

#endif  /*  0  */





/* Returns true if inflate is currently at the end of a block generated

 * by Z_SYNC_FLUSH or Z_FULL_FLUSH. 

 * IN assertion: s != NULL

 */

#if 0

int zlib_inflate_blocks_sync_point(

	inflate_blocks_statef *s

)

{

  return s->mode == LENS;

}

#endif  /*  0  */

lib/zlib_inflate/infblock.h

+4 −0
Original line number Diff line number Diff line
@@ -33,12 +33,16 @@ extern int zlib_inflate_blocks_free ( 
    inflate_blocks_statef *,

    z_streamp);



#if 0

extern void zlib_inflate_set_dictionary (

    inflate_blocks_statef *s,

    const Byte *d,  /* dictionary */

    uInt  n);       /* dictionary length */

#endif  /*  0  */



#if 0

extern int zlib_inflate_blocks_sync_point (

    inflate_blocks_statef *s);

#endif  /*  0  */



#endif /* _INFBLOCK_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE