Changeset a96fad0 in rtems


Ignore:
Timestamp:
Mar 18, 2011, 10:11:07 AM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.11, master
Children:
ae044bc
Parents:
b3a72166 (diff), 8c05550 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

This commit was generated by cvs2svn to compensate for changes in r25164,
which included commits to RCS files with non-trunk default branches.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/zlib/inflate.h

    rb3a72166 ra96fad0  
    11/* inflate.h -- internal inflate state definition
    2  * Copyright (C) 1995-2004 Mark Adler
     2 * Copyright (C) 1995-2009 Mark Adler
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
     
    3333        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
    3434        STORED,     /* i: waiting for stored size (length and complement) */
     35        COPY_,      /* i/o: same as COPY below, but only first time in */
    3536        COPY,       /* i/o: waiting for input or output to copy stored block */
    3637        TABLE,      /* i: waiting for dynamic block table lengths */
    3738        LENLENS,    /* i: waiting for code length code lengths */
    3839        CODELENS,   /* i: waiting for length/lit and distance code lengths */
    39             LEN,        /* i: waiting for length/lit code */
     40            LEN_,       /* i: same as LEN below, but only first time in */
     41            LEN,        /* i: waiting for length/lit/eob code */
    4042            LENEXT,     /* i: waiting for length extra bits */
    4143            DIST,       /* i: waiting for distance code */
     
    5456    State transitions between above modes -
    5557
    56     (most modes can go to the BAD or MEM mode -- not shown for clarity)
     58    (most modes can go to BAD or MEM on error -- not shown for clarity)
    5759
    5860    Process header:
    59         HEAD -> (gzip) or (zlib)
    60         (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
    61         NAME -> COMMENT -> HCRC -> TYPE
     61        HEAD -> (gzip) or (zlib) or (raw)
     62        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
     63                  HCRC -> TYPE
    6264        (zlib) -> DICTID or TYPE
    6365        DICTID -> DICT -> TYPE
     66        (raw) -> TYPEDO
    6467    Read deflate blocks:
    65             TYPE -> STORED or TABLE or LEN or CHECK
    66             STORED -> COPY -> TYPE
    67             TABLE -> LENLENS -> CODELENS -> LEN
    68     Read deflate codes:
     68            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
     69            STORED -> COPY_ -> COPY -> TYPE
     70            TABLE -> LENLENS -> CODELENS -> LEN_
     71            LEN_ -> LEN
     72    Read deflate codes in fixed or dynamic block:
    6973                LEN -> LENEXT or LIT or TYPE
    7074                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
     
    7478 */
    7579
    76 /* state maintained between inflate() calls.  Approximately 7K bytes. */
     80/* state maintained between inflate() calls.  Approximately 10K bytes. */
    7781struct inflate_state {
    7882    inflate_mode mode;          /* current inflate mode */
     
    8993    unsigned wsize;             /* window size or zero if not using window */
    9094    unsigned whave;             /* valid bytes in the window */
    91     unsigned write;             /* window write index */
     95    unsigned wnext;             /* window write index */
    9296    unsigned char FAR *window;  /* allocated sliding window, if needed */
    9397        /* bit accumulator */
     
    113117    unsigned short work[288];   /* work area for code table building */
    114118    code codes[ENOUGH];         /* space for code tables */
     119    int sane;                   /* if false, allow invalid distance too far */
     120    int back;                   /* bits back of last unprocessed length/lit */
     121    unsigned was;               /* initial length of match */
    115122};
Note: See TracChangeset for help on using the changeset viewer.