diff options
author | Jörn Engel <joern@wohnheim.fh-wedel.de> | 2003-06-07 19:48:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-07 19:48:57 -0700 |
commit | 7403009269fbc9b7ef4653ddab7e74873f0345c0 (patch) | |
tree | 697d762ce331ba3cc3b645198aac3ae8d2ae2ac5 /lib | |
parent | 877551c74f59c3d0ec81dd63c4534c08296b8a0e (diff) | |
download | history-7403009269fbc9b7ef4653ddab7e74873f0345c0.tar.gz |
[PATCH] zlib cleanup: local
Simple s/local/static/.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/zlib_deflate/deflate.c | 42 | ||||
-rw-r--r-- | lib/zlib_deflate/deftree.c | 88 | ||||
-rw-r--r-- | lib/zlib_inflate/infblock.c | 2 | ||||
-rw-r--r-- | lib/zlib_inflate/inffixed.h | 8 | ||||
-rw-r--r-- | lib/zlib_inflate/inftrees.c | 12 |
5 files changed, 76 insertions, 76 deletions
diff --git a/lib/zlib_deflate/deflate.c b/lib/zlib_deflate/deflate.c index 8e9a8191ecc21c..eeda0d2d52594f 100644 --- a/lib/zlib_deflate/deflate.c +++ b/lib/zlib_deflate/deflate.c @@ -66,18 +66,18 @@ typedef enum { typedef block_state (*compress_func) (deflate_state *s, int flush); /* Compression function. Returns the block state after the call. */ -local void fill_window (deflate_state *s); -local block_state deflate_stored (deflate_state *s, int flush); -local block_state deflate_fast (deflate_state *s, int flush); -local block_state deflate_slow (deflate_state *s, int flush); -local void lm_init (deflate_state *s); -local void putShortMSB (deflate_state *s, uInt b); -local void flush_pending (z_streamp strm); -local int read_buf (z_streamp strm, Byte *buf, unsigned size); -local uInt longest_match (deflate_state *s, IPos cur_match); +static void fill_window (deflate_state *s); +static block_state deflate_stored (deflate_state *s, int flush); +static block_state deflate_fast (deflate_state *s, int flush); +static block_state deflate_slow (deflate_state *s, int flush); +static void lm_init (deflate_state *s); +static void putShortMSB (deflate_state *s, uInt b); +static void flush_pending (z_streamp strm); +static int read_buf (z_streamp strm, Byte *buf, unsigned size); +static uInt longest_match (deflate_state *s, IPos cur_match); #ifdef DEBUG_ZLIB -local void check_match (deflate_state *s, IPos start, IPos match, +static void check_match (deflate_state *s, IPos start, IPos match, int length); #endif @@ -111,7 +111,7 @@ typedef struct config_s { compress_func func; } config; -local const config configuration_table[10] = { +static const config configuration_table[10] = { /* good lazy nice chain */ /* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ /* 1 */ {4, 4, 8, 4, deflate_fast}, /* maximum speed, no lazy matches */ @@ -371,7 +371,7 @@ int zlib_deflateParams( * IN assertion: the stream state is correct and there is enough room in * pending_buf. */ -local void putShortMSB( +static void putShortMSB( deflate_state *s, uInt b ) @@ -386,7 +386,7 @@ local void putShortMSB( * to avoid allocating a large strm->next_out buffer and copying into it. * (See also read_buf()). */ -local void flush_pending( +static void flush_pending( z_streamp strm ) { @@ -632,7 +632,7 @@ int zlib_deflateCopy ( * allocating a large strm->next_in buffer and copying from it. * (See also flush_pending()). */ -local int read_buf( +static int read_buf( z_streamp strm, Byte *buf, unsigned size @@ -658,7 +658,7 @@ local int read_buf( /* =========================================================================== * Initialize the "longest match" routines for a new zlib stream */ -local void lm_init( +static void lm_init( deflate_state *s ) { @@ -693,7 +693,7 @@ local void lm_init( /* For 80x86 and 680x0, an optimized version will be provided in match.asm or * match.S. The code will be functionally equivalent. */ -local uInt longest_match( +static uInt longest_match( deflate_state *s, IPos cur_match /* current match */ ) @@ -836,7 +836,7 @@ local uInt longest_match( /* =========================================================================== * Check that the match at match_start is indeed a match. */ -local void check_match( +static void check_match( deflate_state *s, IPos start, IPos match, @@ -872,7 +872,7 @@ local void check_match( * performed for at least two bytes (required for the zip translate_eol * option -- not supported here). */ -local void fill_window(s) +static void fill_window(s) deflate_state *s; { register unsigned n, m; @@ -991,7 +991,7 @@ local void fill_window(s) * NOTE: this function should be optimized to avoid extra copying from * window to pending_buf. */ -local block_state deflate_stored( +static block_state deflate_stored( deflate_state *s, int flush ) @@ -1050,7 +1050,7 @@ local block_state deflate_stored( * new strings in the dictionary only for unmatched strings or for short * matches. It is used only for the fast compression options. */ -local block_state deflate_fast( +static block_state deflate_fast( deflate_state *s, int flush ) @@ -1144,7 +1144,7 @@ local block_state deflate_fast( * evaluation for matches: a match is finally adopted only if there is * no better match at the next window position. */ -local block_state deflate_slow( +static block_state deflate_slow( deflate_state *s, int flush ) diff --git a/lib/zlib_deflate/deftree.c b/lib/zlib_deflate/deftree.c index 91d7d1a0a01589..a016755d0a361c 100644 --- a/lib/zlib_deflate/deftree.c +++ b/lib/zlib_deflate/deftree.c @@ -60,16 +60,16 @@ #define REPZ_11_138 18 /* repeat a zero length 11-138 times (7 bits of repeat count) */ -local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ +static const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; -local const int extra_dbits[D_CODES] /* extra bits for each distance code */ +static const int extra_dbits[D_CODES] /* extra bits for each distance code */ = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; -local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ +static const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; -local const uch bl_order[BL_CODES] +static const uch bl_order[BL_CODES] = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; /* The lengths of the bit length codes are sent in order of decreasing * probability, to avoid transmitting the lengths for unused bit length codes. @@ -84,31 +84,31 @@ local const uch bl_order[BL_CODES] * Local data. These are initialized only once. */ -local ct_data static_ltree[L_CODES+2]; +static ct_data static_ltree[L_CODES+2]; /* The static literal tree. Since the bit lengths are imposed, there is no * need for the L_CODES extra codes used during heap construction. However * The codes 286 and 287 are needed to build a canonical tree (see zlib_tr_init * below). */ -local ct_data static_dtree[D_CODES]; +static ct_data static_dtree[D_CODES]; /* The static distance tree. (Actually a trivial tree since all codes use * 5 bits.) */ -local uch dist_code[512]; +static uch dist_code[512]; /* distance codes. The first 256 values correspond to the distances * 3 .. 258, the last 256 values correspond to the top 8 bits of * the 15 bit distances. */ -local uch length_code[MAX_MATCH-MIN_MATCH+1]; +static uch length_code[MAX_MATCH-MIN_MATCH+1]; /* length code for each normalized match length (0 == MIN_MATCH) */ -local int base_length[LENGTH_CODES]; +static int base_length[LENGTH_CODES]; /* First normalized length for each code (0 = MIN_MATCH) */ -local int base_dist[D_CODES]; +static int base_dist[D_CODES]; /* First normalized distance for each code (0 = distance of 1) */ struct static_tree_desc_s { @@ -119,37 +119,37 @@ struct static_tree_desc_s { int max_length; /* max bit length for the codes */ }; -local static_tree_desc static_l_desc = +static static_tree_desc static_l_desc = {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; -local static_tree_desc static_d_desc = +static static_tree_desc static_d_desc = {static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; -local static_tree_desc static_bl_desc = +static static_tree_desc static_bl_desc = {(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; /* =========================================================================== * Local (static) routines in this file. */ -local void tr_static_init (void); -local void init_block (deflate_state *s); -local void pqdownheap (deflate_state *s, ct_data *tree, int k); -local void gen_bitlen (deflate_state *s, tree_desc *desc); -local void gen_codes (ct_data *tree, int max_code, ush *bl_count); -local void build_tree (deflate_state *s, tree_desc *desc); -local void scan_tree (deflate_state *s, ct_data *tree, int max_code); -local void send_tree (deflate_state *s, ct_data *tree, int max_code); -local int build_bl_tree (deflate_state *s); -local void send_all_trees (deflate_state *s, int lcodes, int dcodes, +static void tr_static_init (void); +static void init_block (deflate_state *s); +static void pqdownheap (deflate_state *s, ct_data *tree, int k); +static void gen_bitlen (deflate_state *s, tree_desc *desc); +static void gen_codes (ct_data *tree, int max_code, ush *bl_count); +static void build_tree (deflate_state *s, tree_desc *desc); +static void scan_tree (deflate_state *s, ct_data *tree, int max_code); +static void send_tree (deflate_state *s, ct_data *tree, int max_code); +static int build_bl_tree (deflate_state *s); +static void send_all_trees (deflate_state *s, int lcodes, int dcodes, int blcodes); -local void compress_block (deflate_state *s, ct_data *ltree, +static void compress_block (deflate_state *s, ct_data *ltree, ct_data *dtree); -local void set_data_type (deflate_state *s); -local unsigned bi_reverse (unsigned value, int length); -local void bi_windup (deflate_state *s); -local void bi_flush (deflate_state *s); -local void copy_block (deflate_state *s, char *buf, unsigned len, +static void set_data_type (deflate_state *s); +static unsigned bi_reverse (unsigned value, int length); +static void bi_windup (deflate_state *s); +static void bi_flush (deflate_state *s); +static void copy_block (deflate_state *s, char *buf, unsigned len, int header); #ifndef DEBUG_ZLIB @@ -174,9 +174,9 @@ local void copy_block (deflate_state *s, char *buf, unsigned len, * IN assertion: length <= 16 and value fits in length bits. */ #ifdef DEBUG_ZLIB -local void send_bits (deflate_state *s, int value, int length); +static void send_bits (deflate_state *s, int value, int length); -local void send_bits( +static void send_bits( deflate_state *s, int value, /* value to send */ int length /* number of bits */ @@ -226,7 +226,7 @@ local void send_bits( * this function may be called by two threads concurrently, but this is * harmless since both invocations do exactly the same thing. */ -local void tr_static_init(void) +static void tr_static_init(void) { static int static_init_done = 0; int n; /* iterates over tree elements */ @@ -327,7 +327,7 @@ void zlib_tr_init( /* =========================================================================== * Initialize a new block. */ -local void init_block( +static void init_block( deflate_state *s ) { @@ -372,7 +372,7 @@ local void init_block( * when the heap property is re-established (each father smaller than its * two sons). */ -local void pqdownheap( +static void pqdownheap( deflate_state *s, ct_data *tree, /* the tree to restore */ int k /* node to move down */ @@ -408,7 +408,7 @@ local void pqdownheap( * The length opt_len is updated; static_len is also updated if stree is * not null. */ -local void gen_bitlen( +static void gen_bitlen( deflate_state *s, tree_desc *desc /* the tree descriptor */ ) @@ -496,7 +496,7 @@ local void gen_bitlen( * OUT assertion: the field code is set for all tree elements of non * zero code length. */ -local void gen_codes( +static void gen_codes( ct_data *tree, /* the tree to decorate */ int max_code, /* largest code with non zero frequency */ ush *bl_count /* number of codes at each bit length */ @@ -539,7 +539,7 @@ local void gen_codes( * and corresponding code. The length opt_len is updated; static_len is * also updated if stree is not null. The field max_code is set. */ -local void build_tree( +static void build_tree( deflate_state *s, tree_desc *desc /* the tree descriptor */ ) @@ -627,7 +627,7 @@ local void build_tree( * Scan a literal or distance tree to determine the frequencies of the codes * in the bit length tree. */ -local void scan_tree( +static void scan_tree( deflate_state *s, ct_data *tree, /* the tree to be scanned */ int max_code /* and its largest code of non zero frequency */ @@ -673,7 +673,7 @@ local void scan_tree( * Send a literal or distance tree in compressed form, using the codes in * bl_tree. */ -local void send_tree( +static void send_tree( deflate_state *s, ct_data *tree, /* the tree to be scanned */ int max_code /* and its largest code of non zero frequency */ @@ -725,7 +725,7 @@ local void send_tree( * Construct the Huffman tree for the bit lengths and return the index in * bl_order of the last bit length code to send. */ -local int build_bl_tree( +static int build_bl_tree( deflate_state *s ) { @@ -761,7 +761,7 @@ local int build_bl_tree( * lengths of the bit length codes, the literal tree and the distance tree. * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. */ -local void send_all_trees( +static void send_all_trees( deflate_state *s, int lcodes, /* number of codes for each tree */ int dcodes, /* number of codes for each tree */ @@ -1019,7 +1019,7 @@ int zlib_tr_tally( /* =========================================================================== * Send the block data compressed using the given Huffman trees */ -local void compress_block( +static void compress_block( deflate_state *s, ct_data *ltree, /* literal tree */ ct_data *dtree /* distance tree */ @@ -1073,7 +1073,7 @@ local void compress_block( * IN assertion: the fields freq of dyn_ltree are set and the total of all * frequencies does not exceed 64K (to fit in an int on 16 bit machines). */ -local void set_data_type( +static void set_data_type( deflate_state *s ) { @@ -1090,7 +1090,7 @@ local void set_data_type( * Copy a stored block, storing first the length and its * one's complement if requested. */ -local void copy_block( +static void copy_block( deflate_state *s, char *buf, /* the input data */ unsigned len, /* its length */ diff --git a/lib/zlib_inflate/infblock.c b/lib/zlib_inflate/infblock.c index 18debabae9f69e..801e8e892c65be 100644 --- a/lib/zlib_inflate/infblock.c +++ b/lib/zlib_inflate/infblock.c @@ -16,7 +16,7 @@ struct inflate_codes_state; #define bits word.what.Bits /* Table for deflate from PKZIP's appnote.txt. */ -local const uInt border[] = { /* Order of the bit length code lengths */ +static const uInt border[] = { /* Order of the bit length code lengths */ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; /* diff --git a/lib/zlib_inflate/inffixed.h b/lib/zlib_inflate/inffixed.h index 77f7e76314521e..5f162dcef6126a 100644 --- a/lib/zlib_inflate/inffixed.h +++ b/lib/zlib_inflate/inffixed.h @@ -7,9 +7,9 @@ subject to change. Applications should only use zlib.h. */ -local uInt fixed_bl = 9; -local uInt fixed_bd = 5; -local inflate_huft fixed_tl[] = { +static uInt fixed_bl = 9; +static uInt fixed_bd = 5; +static inflate_huft fixed_tl[] = { {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115}, {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192}, {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160}, @@ -139,7 +139,7 @@ local inflate_huft fixed_tl[] = { {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191}, {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255} }; -local inflate_huft fixed_td[] = { +static inflate_huft fixed_td[] = { {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097}, {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385}, {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193}, diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c index 363c6c067ba00e..7252631967d744 100644 --- a/lib/zlib_inflate/inftrees.c +++ b/lib/zlib_inflate/inftrees.c @@ -22,7 +22,7 @@ struct internal_state; #define bits word.what.Bits -local int huft_build ( +static int huft_build ( uInt *, /* code lengths in bits */ uInt, /* number of codes */ uInt, /* number of "simple" codes */ @@ -35,18 +35,18 @@ local int huft_build ( uInt * ); /* space for values */ /* Tables for deflate from PKZIP's appnote.txt. */ -local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */ +static const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; /* see note #13 above about 258 */ -local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */ +static const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */ -local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */ +static const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; -local const uInt cpdext[30] = { /* Extra bits for distance codes */ +static const uInt cpdext[30] = { /* Extra bits for distance codes */ 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; @@ -87,7 +87,7 @@ local const uInt cpdext[30] = { /* Extra bits for distance codes */ /* If BMAX needs to be larger than 16, then h and x[] should be uLong. */ #define BMAX 15 /* maximum bit length of any code */ -local int huft_build( +static int huft_build( uInt *b, /* code lengths in bits (all assumed <= BMAX) */ uInt n, /* number of codes (assumed <= 288) */ uInt s, /* number of simple-valued codes (0..s-1) */ |