Changeset bf6f9b3d in rtems


Ignore:
Timestamp:
Mar 18, 2011, 10:11:46 AM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.11, master
Children:
c29ecea5
Parents:
8e0d0c74
Message:

Import from zlib-1.2.5

Location:
cpukit/zlib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/zlib/deflate.h

    r8e0d0c74 rbf6f9b3d  
    11/* deflate.h -- internal compression state
    2  * Copyright (C) 1995-2009 Jean-loup Gailly
     2 * Copyright (C) 1995-2010 Jean-loup Gailly
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
     
    291291
    292292        /* in trees.c */
    293 void _tr_init        OF((deflate_state *s));
    294 int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
    295 void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
    296                           int last));
    297 void _tr_align        OF((deflate_state *s));
    298 void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
    299                           int last));
     293void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
     294int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
     295void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
     296                        ulg stored_len, int last));
     297void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
     298void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
     299                        ulg stored_len, int last));
    300300
    301301#define d_code(dist) \
     
    310310
    311311#if defined(GEN_TREES_H) || !defined(STDC)
    312   extern uch _length_code[];
    313   extern uch _dist_code[];
     312  extern uch ZLIB_INTERNAL _length_code[];
     313  extern uch ZLIB_INTERNAL _dist_code[];
    314314#else
    315   extern const uch _length_code[];
    316   extern const uch _dist_code[];
     315  extern const uch ZLIB_INTERNAL _length_code[];
     316  extern const uch ZLIB_INTERNAL _dist_code[];
    317317#endif
    318318
  • cpukit/zlib/trees.c

    r8e0d0c74 rbf6f9b3d  
    11/* trees.c -- output deflated data using Huffman coding
    2  * Copyright (C) 1995-2009 Jean-loup Gailly
     2 * Copyright (C) 1995-2010 Jean-loup Gailly
    33 * detect_data_type() function provided freely by Cosmin Truta, 2006
    44 * For conditions of distribution and use, see copyright notice in zlib.h
     
    352352    }
    353353
    354     fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
     354    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
    355355    for (i = 0; i < DIST_CODE_LEN; i++) {
    356356        fprintf(header, "%2u%s", _dist_code[i],
     
    358358    }
    359359
    360     fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
     360    fprintf(header,
     361        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
    361362    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
    362363        fprintf(header, "%2u%s", _length_code[i],
     
    383384 * Initialize the tree data structures for a new zlib stream.
    384385 */
    385 void _tr_init(s)
     386void ZLIB_INTERNAL _tr_init(s)
    386387    deflate_state *s;
    387388{
     
    868869 * Send a stored block
    869870 */
    870 void _tr_stored_block(s, buf, stored_len, last)
     871void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
    871872    deflate_state *s;
    872873    charf *buf;       /* input block */
     
    893894 * on one bit only.
    894895 */
    895 void _tr_align(s)
     896void ZLIB_INTERNAL _tr_align(s)
    896897    deflate_state *s;
    897898{
     
    922923 * trees or store, and output the encoded block to the zip file.
    923924 */
    924 void _tr_flush_block(s, buf, stored_len, last)
     925void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
    925926    deflate_state *s;
    926927    charf *buf;       /* input block, or NULL if too old */
     
    10231024 * the current block must be flushed.
    10241025 */
    1025 int _tr_tally (s, dist, lc)
     1026int ZLIB_INTERNAL _tr_tally (s, dist, lc)
    10261027    deflate_state *s;
    10271028    unsigned dist;  /* distance of matched string */
Note: See TracChangeset for help on using the changeset viewer.