]>
Commit | Line | Data |
---|---|---|
5608196b AM |
1 | diff -urN mod_gzip-1.3.26.1a.org/mod_gzip.c mod_gzip-1.3.26.1a/mod_gzip.c |
2 | --- mod_gzip-1.3.26.1a.org/mod_gzip.c Fri Apr 25 11:52:24 2003 | |
3 | +++ mod_gzip-1.3.26.1a/mod_gzip.c Fri Apr 25 15:33:54 2003 | |
4 | @@ -7508,7 +7508,7 @@ | |
5 | mod_gzip_printf( "%s: Call gzp_main(r,gzp)...",cn); | |
6 | #endif | |
7 | ||
8 | - rc = gzp_main( r, gzp ); | |
9 | + rc = mod_gzip_gzp_main( r, gzp ); | |
10 | ||
11 | output_size = (long) gzp->bytes_out; | |
12 | ||
13 | @@ -8100,7 +8100,7 @@ | |
14 | mod_gzip_strcpy(gzc.input_filename, r->filename); | |
15 | mod_gzip_strcpy(gzc.output_filename,dest); | |
16 | ||
17 | - rc = gzp_main(r,&gzc); | |
18 | + rc = mod_gzip_gzp_main(r,&gzc); | |
19 | ||
20 | #ifdef MOD_GZIP_USES_APACHE_LOGS | |
21 | if(gzc.bytes_out > 0) { | |
22 | diff -urN mod_gzip-1.3.26.1a.org/mod_gzip.h mod_gzip-1.3.26.1a/mod_gzip.h | |
23 | --- mod_gzip-1.3.26.1a.org/mod_gzip.h Fri Apr 25 11:52:24 2003 | |
24 | +++ mod_gzip-1.3.26.1a/mod_gzip.h Fri Apr 25 15:32:16 2003 | |
25 | @@ -354,7 +354,7 @@ | |
26 | ||
27 | } GZP_CONTROL; | |
28 | ||
29 | -int gzp_main(request_rec *, GZP_CONTROL *); | |
30 | +int mod_gzip_gzp_main(request_rec *, GZP_CONTROL *); | |
31 | char *mod_gzip_generate_vary_header(mod_gzip_conf *,struct pool *); | |
32 | int mod_gzip_compress_file(request_rec *,char *); | |
33 | ||
34 | diff -urN mod_gzip-1.3.26.1a.org/mod_gzip_compress.c mod_gzip-1.3.26.1a/mod_gzip_compress.c | |
35 | --- mod_gzip-1.3.26.1a.org/mod_gzip_compress.c Fri Apr 25 11:52:24 2003 | |
36 | +++ mod_gzip-1.3.26.1a/mod_gzip_compress.c Fri Apr 25 15:31:52 2003 | |
37 | @@ -678,7 +678,7 @@ | |
38 | ush max_chain; | |
39 | } config; | |
40 | ||
41 | -config configuration_table[10] = { | |
42 | +static config configuration_table[10] = { | |
43 | ||
44 | {0, 0, 0, 0}, | |
45 | {4, 4, 8, 4}, | |
46 | @@ -723,19 +723,19 @@ | |
47 | } v; | |
48 | }; | |
49 | ||
50 | -uch bl_order[BL_CODES] | |
51 | +static uch bl_order[BL_CODES] | |
52 | = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; | |
53 | ||
54 | -int extra_lbits[LENGTH_CODES] | |
55 | +static int extra_lbits[LENGTH_CODES] | |
56 | = {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}; | |
57 | ||
58 | -int extra_dbits[D_CODES] | |
59 | +static int extra_dbits[D_CODES] | |
60 | = {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}; | |
61 | ||
62 | -int extra_blbits[BL_CODES] | |
63 | +static int extra_blbits[BL_CODES] | |
64 | = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; | |
65 | ||
66 | -ulg crc_32_tab[] = { | |
67 | +static ulg crc_32_tab[] = { | |
68 | 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, | |
69 | 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, | |
70 | 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, | |
71 | @@ -941,7 +941,7 @@ | |
72 | ||
73 | } GZ1; | |
74 | typedef GZ1 *PGZ1; | |
75 | -int gz1_size = sizeof( GZ1 ); | |
76 | +static int gz1_size = sizeof( GZ1 ); | |
77 | ||
78 | /* Declare some local function protypes... */ | |
79 | ||
80 | @@ -952,118 +952,118 @@ | |
81 | /* if the code is being compiled directly into the parent */ | |
82 | /* instead of being built as a standalone DLL or DSO library. */ | |
83 | ||
84 | -PGZ1 gz1_init ( void ); | |
85 | -int gz1_cleanup ( PGZ1 gz1 ); | |
86 | -ulg gz1_deflate ( PGZ1 gz1 ); | |
87 | -ulg gz1_deflate_fast( PGZ1 gz1 ); | |
88 | +static PGZ1 gz1_init ( void ); | |
89 | +static int gz1_cleanup ( PGZ1 gz1 ); | |
90 | +static ulg gz1_deflate ( PGZ1 gz1 ); | |
91 | +static ulg gz1_deflate_fast( PGZ1 gz1 ); | |
92 | ||
93 | /* The rest of the routines should not need the 'gz1_' prefix. */ | |
94 | /* No conflicts reported at this time. */ | |
95 | ||
96 | -int inflate ( PGZ1 gz1 ); | |
97 | -int inflate_dynamic( PGZ1 gz1 ); | |
98 | -int inflate_stored ( PGZ1 gz1 ); | |
99 | -int inflate_fixed ( PGZ1 gz1 ); | |
100 | -void fill_window ( PGZ1 gz1 ); | |
101 | -void flush_outbuf ( PGZ1 gz1 ); | |
102 | -void flush_window ( PGZ1 gz1 ); | |
103 | -void bi_windup ( PGZ1 gz1 ); | |
104 | -void set_file_type ( PGZ1 gz1 ); | |
105 | -void init_block ( PGZ1 gz1 ); | |
106 | -int build_bl_tree ( PGZ1 gz1 ); | |
107 | -void read_error ( PGZ1 gz1 ); | |
108 | -void write_error ( PGZ1 gz1 ); | |
109 | -int get_header ( PGZ1 gz1, int in ); | |
110 | -int inflate_block ( PGZ1 gz1, int *e ); | |
111 | -int fill_inbuf ( PGZ1 gz1, int eof_ok ); | |
112 | -char *gz1_basename ( PGZ1 gz1, char *fname ); | |
113 | -int longest_match ( PGZ1 gz1, unsigned cur_match ); | |
114 | -void bi_init ( PGZ1 gz1, gz1_file_t zipfile ); | |
115 | -int file_read ( PGZ1 gz1, char *buf, unsigned size ); | |
116 | -void write_buf ( PGZ1 gz1, int fd, voidp buf, unsigned cnt ); | |
117 | +static int inflate ( PGZ1 gz1 ); | |
118 | +static int inflate_dynamic( PGZ1 gz1 ); | |
119 | +static int inflate_stored ( PGZ1 gz1 ); | |
120 | +static int inflate_fixed ( PGZ1 gz1 ); | |
121 | +static void fill_window ( PGZ1 gz1 ); | |
122 | +static void flush_outbuf ( PGZ1 gz1 ); | |
123 | +static void flush_window ( PGZ1 gz1 ); | |
124 | +static void bi_windup ( PGZ1 gz1 ); | |
125 | +static void set_file_type ( PGZ1 gz1 ); | |
126 | +static void init_block ( PGZ1 gz1 ); | |
127 | +static int build_bl_tree ( PGZ1 gz1 ); | |
128 | +static void read_error ( PGZ1 gz1 ); | |
129 | +static void write_error ( PGZ1 gz1 ); | |
130 | +static int get_header ( PGZ1 gz1, int in ); | |
131 | +static int inflate_block ( PGZ1 gz1, int *e ); | |
132 | +static int fill_inbuf ( PGZ1 gz1, int eof_ok ); | |
133 | +static char *gz1_basename ( PGZ1 gz1, char *fname ); | |
134 | +static int longest_match ( PGZ1 gz1, unsigned cur_match ); | |
135 | +static void bi_init ( PGZ1 gz1, gz1_file_t zipfile ); | |
136 | +static int file_read ( PGZ1 gz1, char *buf, unsigned size ); | |
137 | +static void write_buf ( PGZ1 gz1, int fd, voidp buf, unsigned cnt ); | |
138 | ||
139 | -void error( char *msg ); | |
140 | +static void error( char *msg ); | |
141 | ||
142 | -int zip( | |
143 | +static int zip( | |
144 | PGZ1 gz1, | |
145 | int in, | |
146 | int out | |
147 | ); | |
148 | ||
149 | -ulg flush_block( | |
150 | +static ulg flush_block( | |
151 | PGZ1 gz1, | |
152 | char *buf, | |
153 | ulg stored_len, | |
154 | int eof | |
155 | ); | |
156 | ||
157 | -void copy_block( | |
158 | +static void copy_block( | |
159 | PGZ1 gz1, | |
160 | char *buf, | |
161 | unsigned len, | |
162 | int header | |
163 | ); | |
164 | ||
165 | -int ct_tally( | |
166 | +static int ct_tally( | |
167 | PGZ1 gz1, | |
168 | int dist, | |
169 | int lc | |
170 | ); | |
171 | ||
172 | -void send_bits( | |
173 | +static void send_bits( | |
174 | PGZ1 gz1, | |
175 | int value, | |
176 | int length | |
177 | ); | |
178 | ||
179 | -void send_tree( | |
180 | +static void send_tree( | |
181 | PGZ1 gz1, | |
182 | ct_data *tree, | |
183 | int max_code | |
184 | ); | |
185 | ||
186 | -void send_all_trees( | |
187 | +static void send_all_trees( | |
188 | PGZ1 gz1, | |
189 | int lcodes, | |
190 | int dcodes, | |
191 | int blcodes | |
192 | ); | |
193 | ||
194 | -void mod_gzip_ct_init( | |
195 | +static void mod_gzip_ct_init( | |
196 | PGZ1 gz1, | |
197 | ush *attr, | |
198 | int *methodp | |
199 | ); | |
200 | ||
201 | -void lm_init( | |
202 | +static void lm_init( | |
203 | PGZ1 gz1, | |
204 | int pack_level, | |
205 | ush *flags | |
206 | ); | |
207 | ||
208 | -void build_tree( | |
209 | +static void build_tree( | |
210 | PGZ1 gz1, | |
211 | tree_desc *desc | |
212 | ); | |
213 | ||
214 | -void compress_block( | |
215 | +static void compress_block( | |
216 | PGZ1 gz1, | |
217 | ct_data *ltree, | |
218 | ct_data *dtree | |
219 | ); | |
220 | ||
221 | -void gen_bitlen( | |
222 | +static void gen_bitlen( | |
223 | PGZ1 gz1, | |
224 | tree_desc *desc | |
225 | ); | |
226 | ||
227 | -void pqdownheap( | |
228 | +static void pqdownheap( | |
229 | PGZ1 gz1, | |
230 | ct_data *tree, | |
231 | int k | |
232 | ); | |
233 | ||
234 | -int huft_build( | |
235 | +static int huft_build( | |
236 | PGZ1 gz1, | |
237 | unsigned *b, | |
238 | unsigned n, | |
239 | @@ -1074,13 +1074,13 @@ | |
240 | int *m | |
241 | ); | |
242 | ||
243 | -ulg updcrc( | |
244 | +static ulg updcrc( | |
245 | PGZ1 gz1, | |
246 | uch *s, | |
247 | unsigned n | |
248 | ); | |
249 | ||
250 | -int inflate_codes( | |
251 | +static int inflate_codes( | |
252 | PGZ1 gz1, | |
253 | struct huft *tl, | |
254 | struct huft *td, | |
255 | @@ -1088,30 +1088,30 @@ | |
256 | int bd | |
257 | ); | |
258 | ||
259 | -void gen_codes( | |
260 | +static void gen_codes( | |
261 | PGZ1 gz1, | |
262 | ct_data *tree, | |
263 | int max_code | |
264 | ); | |
265 | ||
266 | -void scan_tree( | |
267 | +static void scan_tree( | |
268 | PGZ1 gz1, | |
269 | ct_data *tree, | |
270 | int max_code | |
271 | ); | |
272 | ||
273 | -unsigned bi_reverse( | |
274 | +static unsigned bi_reverse( | |
275 | PGZ1 gz1, | |
276 | unsigned code, | |
277 | int len | |
278 | ); | |
279 | ||
280 | -int huft_free( | |
281 | +static int huft_free( | |
282 | PGZ1 gz1, | |
283 | struct huft *t | |
284 | ); | |
285 | ||
286 | -PGZ1 gz1_init() | |
287 | +static PGZ1 gz1_init() | |
288 | { | |
289 | PGZ1 gz1=0; | |
290 | ||
291 | @@ -1232,7 +1232,7 @@ | |
292 | ||
293 | } | |
294 | ||
295 | -int gz1_cleanup( PGZ1 gz1 ) | |
296 | +static int gz1_cleanup( PGZ1 gz1 ) | |
297 | { | |
298 | ||
299 | #ifndef MAXSEG_64K | |
300 | @@ -1254,20 +1254,20 @@ | |
301 | return 0; | |
302 | } | |
303 | ||
304 | -int (*read_buf)(PGZ1 gz1, char *buf, unsigned size); | |
305 | +static int (*read_buf)(PGZ1 gz1, char *buf, unsigned size); | |
306 | ||
307 | -void error( char *msg ) | |
308 | +static void error( char *msg ) | |
309 | { | |
310 | msg = msg; | |
311 | } | |
312 | ||
313 | -int (*work)( PGZ1 gz1, int infile, int outfile ) = 0; | |
314 | +static int (*work)( PGZ1 gz1, int infile, int outfile ) = 0; | |
315 | ||
316 | #ifdef __BORLANDC__ | |
317 | #pragma argsused | |
318 | #endif | |
319 | ||
320 | -int get_header( PGZ1 gz1, int in ) | |
321 | +static int get_header( PGZ1 gz1, int in ) | |
322 | { | |
323 | uch flags; | |
324 | char magic[2]; | |
325 | @@ -1365,7 +1365,7 @@ | |
326 | return gz1->method; | |
327 | } | |
328 | ||
329 | -int fill_inbuf( PGZ1 gz1, int eof_ok ) | |
330 | +static int fill_inbuf( PGZ1 gz1, int eof_ok ) | |
331 | { | |
332 | int len; | |
333 | int bytes_to_copy; | |
334 | @@ -1429,7 +1429,7 @@ | |
335 | return gz1->inbuf[0]; | |
336 | } | |
337 | ||
338 | -ulg updcrc( | |
339 | +static ulg updcrc( | |
340 | PGZ1 gz1, | |
341 | uch *s, | |
342 | unsigned n | |
343 | @@ -1459,12 +1459,12 @@ | |
344 | return( c ^ 0xffffffffL ); | |
345 | } | |
346 | ||
347 | -void read_error( PGZ1 gz1 ) | |
348 | +static void read_error( PGZ1 gz1 ) | |
349 | { | |
350 | gz1->abortflag = 1; | |
351 | } | |
352 | ||
353 | -void mod_gzip_strlwr( char *s ) | |
354 | +static void mod_gzip_strlwr( char *s ) | |
355 | { | |
356 | char *p1=s; | |
357 | ||
358 | @@ -1481,7 +1481,7 @@ | |
359 | #pragma argsused | |
360 | #endif | |
361 | ||
362 | -char *gz1_basename( PGZ1 gz1, char *fname ) | |
363 | +static char *gz1_basename( PGZ1 gz1, char *fname ) | |
364 | { | |
365 | char *p; | |
366 | if ((p = strrchr(fname, PATH_SEP)) != NULL) fname = p+1; | |
367 | @@ -1498,7 +1498,7 @@ | |
368 | return fname; | |
369 | } | |
370 | ||
371 | -void write_buf( PGZ1 gz1, int fd, voidp buf, unsigned cnt ) | |
372 | +static void write_buf( PGZ1 gz1, int fd, voidp buf, unsigned cnt ) | |
373 | { | |
374 | unsigned n; | |
375 | ||
376 | @@ -1528,7 +1528,7 @@ | |
377 | } | |
378 | } | |
379 | ||
380 | -void write_error( PGZ1 gz1 ) | |
381 | +static void write_error( PGZ1 gz1 ) | |
382 | { | |
383 | gz1->abortflag = 1; | |
384 | } | |
385 | @@ -1538,7 +1538,7 @@ | |
386 | ||
387 | static ush ptr_offset = 0; | |
388 | ||
389 | -void * fcalloc( | |
390 | +static void * fcalloc( | |
391 | unsigned items, | |
392 | unsigned size | |
393 | ) | |
394 | @@ -1562,7 +1562,7 @@ | |
395 | return buf; | |
396 | } | |
397 | ||
398 | -void fcfree( void *ptr ) | |
399 | +static void fcfree( void *ptr ) | |
400 | { | |
401 | *((ush*)&ptr+1) -= (ptr_offset + 15) >> 4; | |
402 | *(ush*)&ptr = ptr_offset; | |
403 | @@ -1573,7 +1573,7 @@ | |
404 | #endif | |
405 | #endif | |
406 | ||
407 | -int zip( | |
408 | +static int zip( | |
409 | PGZ1 gz1, | |
410 | int in, | |
411 | int out | |
412 | @@ -1637,7 +1637,7 @@ | |
413 | return OK; | |
414 | } | |
415 | ||
416 | -ulg gz1_deflate( PGZ1 gz1 ) | |
417 | +static ulg gz1_deflate( PGZ1 gz1 ) | |
418 | { | |
419 | unsigned hash_head; | |
420 | unsigned prev_match; | |
421 | @@ -1724,7 +1724,7 @@ | |
422 | return 0; | |
423 | } | |
424 | ||
425 | -void flush_outbuf( PGZ1 gz1 ) | |
426 | +static void flush_outbuf( PGZ1 gz1 ) | |
427 | { | |
428 | if ( gz1->outcnt == 0 ) | |
429 | { | |
430 | @@ -1737,7 +1737,7 @@ | |
431 | gz1->outcnt = 0; | |
432 | } | |
433 | ||
434 | -void lm_init( | |
435 | +static void lm_init( | |
436 | PGZ1 gz1, | |
437 | int pack_level, | |
438 | ush *flags | |
439 | @@ -1805,7 +1805,7 @@ | |
440 | } | |
441 | } | |
442 | ||
443 | -void fill_window( PGZ1 gz1 ) | |
444 | +static void fill_window( PGZ1 gz1 ) | |
445 | { | |
446 | register unsigned n, m; | |
447 | ||
448 | @@ -1856,7 +1856,7 @@ | |
449 | } | |
450 | } | |
451 | ||
452 | -ulg gz1_deflate_fast( PGZ1 gz1 ) | |
453 | +static ulg gz1_deflate_fast( PGZ1 gz1 ) | |
454 | { | |
455 | unsigned hash_head; | |
456 | int flush; | |
457 | @@ -1927,7 +1927,7 @@ | |
458 | return FLUSH_BLOCK(1); | |
459 | } | |
460 | ||
461 | -void mod_gzip_ct_init( | |
462 | +static void mod_gzip_ct_init( | |
463 | PGZ1 gz1, | |
464 | ush *attr, | |
465 | int *methodp | |
466 | @@ -2013,7 +2013,7 @@ | |
467 | init_block( gz1 ); | |
468 | } | |
469 | ||
470 | -ulg flush_block( | |
471 | +static ulg flush_block( | |
472 | PGZ1 gz1, | |
473 | char *buf, | |
474 | ulg stored_len, | |
475 | @@ -2117,7 +2117,7 @@ | |
476 | #pragma argsused | |
477 | #endif | |
478 | ||
479 | -unsigned bi_reverse( | |
480 | +static unsigned bi_reverse( | |
481 | PGZ1 gz1, | |
482 | unsigned code, | |
483 | int len | |
484 | @@ -2134,7 +2134,7 @@ | |
485 | return res >> 1; | |
486 | } | |
487 | ||
488 | -void set_file_type( PGZ1 gz1 ) | |
489 | +static void set_file_type( PGZ1 gz1 ) | |
490 | { | |
491 | int n = 0; | |
492 | unsigned ascii_freq = 0; | |
493 | @@ -2147,7 +2147,7 @@ | |
494 | *gz1->file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; | |
495 | } | |
496 | ||
497 | -void init_block( PGZ1 gz1 ) | |
498 | +static void init_block( PGZ1 gz1 ) | |
499 | { | |
500 | int n; | |
501 | ||
502 | @@ -2166,7 +2166,7 @@ | |
503 | gz1->flag_bit = 1; | |
504 | } | |
505 | ||
506 | -void bi_init( PGZ1 gz1, gz1_file_t zipfile ) | |
507 | +static void bi_init( PGZ1 gz1, gz1_file_t zipfile ) | |
508 | { | |
509 | gz1->zfile = zipfile; | |
510 | gz1->bi_buf = 0; | |
511 | @@ -2178,7 +2178,7 @@ | |
512 | } | |
513 | } | |
514 | ||
515 | -int ct_tally( | |
516 | +static int ct_tally( | |
517 | PGZ1 gz1, | |
518 | int dist, | |
519 | int lc | |
520 | @@ -2231,7 +2231,7 @@ | |
521 | return( gz1->last_lit == LIT_BUFSIZE-1 || gz1->last_dist == DIST_BUFSIZE ); | |
522 | } | |
523 | ||
524 | -void compress_block( | |
525 | +static void compress_block( | |
526 | PGZ1 gz1, | |
527 | ct_data *ltree, | |
528 | ct_data *dtree | |
529 | @@ -2279,7 +2279,7 @@ | |
530 | ||
531 | #ifndef ASMV | |
532 | ||
533 | -int longest_match( PGZ1 gz1, unsigned cur_match ) | |
534 | +static int longest_match( PGZ1 gz1, unsigned cur_match ) | |
535 | { | |
536 | unsigned chain_length = gz1->max_chain_length; | |
537 | register uch *scan = gz1->window + gz1->strstart; | |
538 | @@ -2363,7 +2363,7 @@ | |
539 | } | |
540 | #endif | |
541 | ||
542 | -void send_bits( | |
543 | +static void send_bits( | |
544 | PGZ1 gz1, | |
545 | int value, | |
546 | int length | |
547 | @@ -2385,7 +2385,7 @@ | |
548 | } | |
549 | } | |
550 | ||
551 | -void build_tree( | |
552 | +static void build_tree( | |
553 | PGZ1 gz1, | |
554 | tree_desc *desc | |
555 | ) | |
556 | @@ -2443,7 +2443,7 @@ | |
557 | gen_codes(gz1,(ct_data *)tree, max_code); | |
558 | } | |
559 | ||
560 | -int build_bl_tree( PGZ1 gz1 ) | |
561 | +static int build_bl_tree( PGZ1 gz1 ) | |
562 | { | |
563 | int max_blindex; | |
564 | ||
565 | @@ -2462,7 +2462,7 @@ | |
566 | return max_blindex; | |
567 | } | |
568 | ||
569 | -void gen_codes( | |
570 | +static void gen_codes( | |
571 | PGZ1 gz1, | |
572 | ct_data *tree, | |
573 | int max_code | |
574 | @@ -2489,7 +2489,7 @@ | |
575 | return; | |
576 | } | |
577 | ||
578 | -void gen_bitlen( | |
579 | +static void gen_bitlen( | |
580 | PGZ1 gz1, | |
581 | tree_desc *desc | |
582 | ) | |
583 | @@ -2552,7 +2552,7 @@ | |
584 | } | |
585 | } | |
586 | ||
587 | -void copy_block( | |
588 | +static void copy_block( | |
589 | PGZ1 gz1, | |
590 | char *buf, | |
591 | unsigned len, | |
592 | @@ -2581,7 +2581,7 @@ | |
593 | } | |
594 | } | |
595 | ||
596 | -int file_read( PGZ1 gz1, char *buf, unsigned size ) | |
597 | +static int file_read( PGZ1 gz1, char *buf, unsigned size ) | |
598 | { | |
599 | unsigned len = 0; | |
600 | unsigned bytes_to_copy = 0; | |
601 | @@ -2626,7 +2626,7 @@ | |
602 | return (int)len; | |
603 | } | |
604 | ||
605 | -void bi_windup( PGZ1 gz1 ) | |
606 | +static void bi_windup( PGZ1 gz1 ) | |
607 | { | |
608 | if ( gz1->bi_valid > 8 ) | |
609 | { | |
610 | @@ -2641,7 +2641,7 @@ | |
611 | gz1->bi_valid = 0; | |
612 | } | |
613 | ||
614 | -void send_all_trees( | |
615 | +static void send_all_trees( | |
616 | PGZ1 gz1, | |
617 | int lcodes, | |
618 | int dcodes, | |
619 | @@ -2663,7 +2663,7 @@ | |
620 | send_tree(gz1,(ct_data *)gz1->dyn_dtree, dcodes-1); | |
621 | } | |
622 | ||
623 | -void send_tree( | |
624 | +static void send_tree( | |
625 | PGZ1 gz1, | |
626 | ct_data *tree, | |
627 | int max_code | |
628 | @@ -2728,7 +2728,7 @@ | |
629 | } | |
630 | } | |
631 | ||
632 | -void scan_tree( | |
633 | +static void scan_tree( | |
634 | PGZ1 gz1, | |
635 | ct_data *tree, | |
636 | int max_code | |
637 | @@ -2794,7 +2794,7 @@ | |
638 | } | |
639 | } | |
640 | ||
641 | -void pqdownheap( | |
642 | +static void pqdownheap( | |
643 | PGZ1 gz1, | |
644 | ct_data *tree, | |
645 | int k | |
646 | @@ -2822,15 +2822,15 @@ | |
647 | #define GZS_DEFLATE1 3 | |
648 | #define GZS_DEFLATE2 4 | |
649 | ||
650 | -int gzs_fsp ( PGZ1 gz1 ); | |
651 | -int gzs_zip1 ( PGZ1 gz1 ); | |
652 | -int gzs_zip2 ( PGZ1 gz1 ); | |
653 | -int gzs_deflate1( PGZ1 gz1 ); | |
654 | -int gzs_deflate2( PGZ1 gz1 ); | |
655 | +static int gzs_fsp ( PGZ1 gz1 ); | |
656 | +static int gzs_zip1 ( PGZ1 gz1 ); | |
657 | +static int gzs_zip2 ( PGZ1 gz1 ); | |
658 | +static int gzs_deflate1( PGZ1 gz1 ); | |
659 | +static int gzs_deflate2( PGZ1 gz1 ); | |
660 | ||
661 | -int gzp_main( request_rec *r, GZP_CONTROL *gzp ) | |
662 | +int mod_gzip_gzp_main( request_rec *r, GZP_CONTROL *gzp ) | |
663 | { | |
664 | - char cn[]="gzp_main()"; | |
665 | + char cn[]="mod_gzip_gzp_main()"; | |
666 | ||
667 | PGZ1 gz1 = 0; | |
668 | int rc = 0; | |
669 | @@ -2996,7 +2996,7 @@ | |
670 | return final_exit_code; | |
671 | } | |
672 | ||
673 | -int gzs_fsp( PGZ1 gz1 ) | |
674 | +static int gzs_fsp( PGZ1 gz1 ) | |
675 | { | |
676 | int rc=0; | |
677 | ||
678 | @@ -3036,7 +3036,7 @@ | |
679 | return( rc ); | |
680 | } | |
681 | ||
682 | -int gzs_zip1( PGZ1 gz1 ) | |
683 | +static int gzs_zip1( PGZ1 gz1 ) | |
684 | { | |
685 | uch flags = 0; | |
686 | ||
687 | @@ -3070,7 +3070,7 @@ | |
688 | return 0; | |
689 | } | |
690 | ||
691 | -int gzs_zip2( PGZ1 gz1 ) | |
692 | +static int gzs_zip2( PGZ1 gz1 ) | |
693 | { | |
694 | #ifdef FUTURE_USE | |
695 | uch flags = 0; | |
696 | @@ -3103,7 +3103,7 @@ | |
697 | return 0; | |
698 | } | |
699 | ||
700 | -int gzs_deflate1( PGZ1 gz1 ) | |
701 | +static int gzs_deflate1( PGZ1 gz1 ) | |
702 | { | |
703 | if ( !gz1->deflate1_initialized ) | |
704 | { | |
705 | @@ -3219,7 +3219,7 @@ | |
706 | return 0; | |
707 | } | |
708 | ||
709 | -int gzs_deflate2( PGZ1 gz1 ) | |
710 | +static int gzs_deflate2( PGZ1 gz1 ) | |
711 | { | |
712 | #if !defined(NO_SIZE_CHECK) && !defined(RECORD_IO) | |
713 | if (gz1->ifile_size != -1L && gz1->isize != (ulg)gz1->ifile_size) |