X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=deflate.c;h=8e539d2623a6eac5d6bc9d471a3ef6088b7bea65;hb=bc893ca8b6c2ebcd8d8ac26c358c0478eace65ea;hp=a551fa3a409d640905fed9e329d10038731f13a5;hpb=2c279ee6f6b4ec0d34dc5b8573959a5322248bb4;p=debian%2Fgzip diff --git a/deflate.c b/deflate.c index a551fa3..8e539d2 100644 --- a/deflate.c +++ b/deflate.c @@ -1,6 +1,6 @@ /* deflate.c -- compress data using the deflation algorithm - Copyright (C) 1999, 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2006, 2009-2013 Free Software Foundation, Inc. Copyright (C) 1992-1993 Jean-loup Gailly This program is free software; you can redistribute it and/or modify @@ -169,7 +169,7 @@ typedef unsigned IPos; /* DECLARE(Pos, head, 1<= HASH_BITS */ -unsigned int near prev_length; + unsigned int near prev_length; /* Length of the best match at previous step. Matches not greater than this * are discarded. This is used in the lazy match evaluation. */ @@ -198,7 +198,7 @@ unsigned int near prev_length; local int eofile; /* flag set at end of input file */ local unsigned lookahead; /* number of valid bytes ahead in window */ -unsigned near max_chain_length; + unsigned max_chain_length; /* To speed up deflation, hash chains are never searched beyond this length. * A higher limit improves compression ratio but degrades the speed. */ @@ -217,7 +217,7 @@ local unsigned int max_lazy_match; local int compr_level; /* compression level (1..9) */ -unsigned near good_match; +unsigned good_match; /* Use a faster search when the previous match is longer than this */ local ulg rsync_sum; /* rolling sum of rsync window */ @@ -236,10 +236,17 @@ typedef struct config { ush max_chain; } config; +#ifdef ASMV +# define static_unless_ASMV +#else +# define static_unless_ASMV static +#endif + #ifdef FULL_SEARCH # define nice_match MAX_MATCH #else - int near nice_match; /* Stop searching when current match exceeds this */ + /* Stop searching when current match exceeds this */ + static_unless_ASMV int nice_match; #endif local config configuration_table[10] = { @@ -264,21 +271,21 @@ local config configuration_table[10] = { /* =========================================================================== * Prototypes for local functions. */ -local void fill_window OF((void)); -local off_t deflate_fast OF((void)); +local void fill_window (void); +local off_t deflate_fast (void); - int longest_match OF((IPos cur_match)); #ifdef ASMV - void match_init OF((void)); /* asm code initialization */ + int longest_match (IPos cur_match); + void match_init (void); /* asm code initialization */ #endif #ifdef DEBUG -local void check_match OF((IPos start, IPos match, int length)); +local void check_match (IPos start, IPos match, int length); #endif /* =========================================================================== * Update a hash value with the given input byte - * IN assertion: all calls to to UPDATE_HASH are made with consecutive + * IN assertion: all calls to UPDATE_HASH are made with consecutive * input characters, so that a running hash key can be computed from the * previous key instead of complete recalculation each time. */ @@ -288,7 +295,7 @@ local void check_match OF((IPos start, IPos match, int length)); * Insert string s in the dictionary and set match_head to the previous head * of the hash chain (the most recent string with same hash key). Return * the previous length of the hash chain. - * IN assertion: all calls to to INSERT_STRING are made with consecutive + * IN assertion: all calls to INSERT_STRING are made with consecutive * input characters and the first MIN_MATCH bytes of s are valid * (except for the last MIN_MATCH-1 bytes of the input file). */ @@ -344,7 +351,7 @@ void lm_init (pack_level, flags) #endif lookahead = read_buf((char*)window, - sizeof(int) <= 2 ? (unsigned)WSIZE : 2*WSIZE); + sizeof(int) <= 2 ? (unsigned)WSIZE : 2*WSIZE); if (lookahead == 0 || lookahead == (unsigned)EOF) { eofile = 1, lookahead = 0; @@ -376,8 +383,8 @@ void lm_init (pack_level, flags) * match.s. The code is functionally equivalent, so you can use the C version * if desired. */ -int longest_match(cur_match) - IPos cur_match; /* current match */ +static int +longest_match(IPos cur_match) { unsigned chain_length = max_chain_length; /* max hash chain length */ register uch *scan = window + strstart; /* current string */ @@ -496,7 +503,7 @@ int longest_match(cur_match) #endif } } while ((cur_match = prev[cur_match & WMASK]) > limit - && --chain_length != 0); + && --chain_length != 0); return best_len; } @@ -653,7 +660,7 @@ local off_t deflate_fast() * At this point we have always match_length < MIN_MATCH */ if (hash_head != NIL && strstart - hash_head <= MAX_DIST - && strstart <= window_size - MIN_LOOKAHEAD) { + && strstart <= window_size - MIN_LOOKAHEAD) { /* To simplify the code, we prevent matches with the string * of window index 0 (in particular we have to avoid a match * of the string with itself at the start of the input file). @@ -684,12 +691,12 @@ local off_t deflate_fast() * the next lookahead bytes will be emitted as literals. */ } while (--match_length != 0); - strstart++; + strstart++; } else { - strstart += match_length; - match_length = 0; - ins_h = window[strstart]; - UPDATE_HASH(ins_h, window[strstart+1]); + strstart += match_length; + match_length = 0; + ins_h = window[strstart]; + UPDATE_HASH(ins_h, window[strstart+1]); #if MIN_MATCH != 3 Call UPDATE_HASH() MIN_MATCH-3 more times #endif @@ -700,7 +707,7 @@ local off_t deflate_fast() flush = ct_tally (0, window[strstart]); RSYNC_ROLL(strstart, 1); lookahead--; - strstart++; + strstart++; } if (rsync && strstart > rsync_chunk_end) { ush attr = 0; /* ascii/binary flag */