diff options
author | hansr <hk-git@circlestorm.org> | 2014-10-09 13:55:20 +0200 |
---|---|---|
committer | hansr <hk-git@circlestorm.org> | 2014-10-09 13:55:20 +0200 |
commit | 0db1040667b13c0f9405af810f669857a487b08e (patch) | |
tree | c34690bf413bc7a5ffc807390ca3e7f435831879 /infback.c | |
parent | e88676a00e1445e3ff30428e8fd16287896c989a (diff) |
Remove FAR definition
Remove a few leftovers from the legacy OS support removal
Diffstat (limited to 'infback.c')
-rw-r--r-- | infback.c | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -16,7 +16,7 @@ #include "inffast.h" /* function prototypes */ -local void fixedtables OF((struct inflate_state FAR *state)); +local void fixedtables OF((struct inflate_state *state)); /* strm provides memory allocation functions in zalloc and zfree, or @@ -28,11 +28,11 @@ local void fixedtables OF((struct inflate_state FAR *state)); int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) z_streamp strm; int windowBits; -unsigned char FAR *window; +unsigned char *window; const char *version; int stream_size; { - struct inflate_state FAR *state; + struct inflate_state *state; if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || stream_size != (int)(sizeof(z_stream))) @@ -55,11 +55,11 @@ int stream_size; #else strm->zfree = zcfree; #endif - state = (struct inflate_state FAR *)ZALLOC(strm, 1, + state = (struct inflate_state *)ZALLOC(strm, 1, sizeof(struct inflate_state)); if (state == Z_NULL) return Z_MEM_ERROR; Tracev((stderr, "inflate: allocated\n")); - strm->state = (struct internal_state FAR *)state; + strm->state = (struct internal_state *)state; state->dmax = 32768U; state->wbits = windowBits; state->wsize = 1U << windowBits; @@ -80,7 +80,7 @@ int stream_size; may not be thread-safe. */ local void fixedtables(state) -struct inflate_state FAR *state; +struct inflate_state *state; { #ifdef BUILDFIXED static int virgin = 1; @@ -250,18 +250,18 @@ struct inflate_state FAR *state; int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) z_streamp strm; in_func in; -void FAR *in_desc; +void *in_desc; out_func out; -void FAR *out_desc; +void *out_desc; { - struct inflate_state FAR *state; - z_const unsigned char FAR *next; /* next input */ - unsigned char FAR *put; /* next output */ + struct inflate_state *state; + z_const unsigned char *next; /* next input */ + unsigned char *put; /* next output */ unsigned have, left; /* available input and output */ unsigned long hold; /* bit buffer */ unsigned bits; /* bits in bit buffer */ unsigned copy; /* number of stored or match bytes to copy */ - unsigned char FAR *from; /* where to copy match bytes from */ + unsigned char *from; /* where to copy match bytes from */ code here; /* current decoding table entry */ code last; /* parent table entry */ unsigned len; /* length to copy for repeats, bits to drop */ @@ -272,7 +272,7 @@ void FAR *out_desc; /* Check that the strm exists and that the state was initialized */ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; + state = (struct inflate_state *)strm->state; /* Reset the state */ strm->msg = Z_NULL; @@ -383,7 +383,7 @@ void FAR *out_desc; while (state->have < 19) state->lens[order[state->have++]] = 0; state->next = state->codes; - state->lencode = (code const FAR *)(state->next); + state->lencode = (code const *)(state->next); state->lenbits = 7; ret = inflate_table(CODES, state->lens, 19, &(state->next), &(state->lenbits), state->work); @@ -457,7 +457,7 @@ void FAR *out_desc; values here (9 and 6) without reading the comments in inftrees.h concerning the ENOUGH constants, which depend on those values */ state->next = state->codes; - state->lencode = (code const FAR *)(state->next); + state->lencode = (code const *)(state->next); state->lenbits = 9; ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), &(state->lenbits), state->work); @@ -466,7 +466,7 @@ void FAR *out_desc; state->mode = BAD; break; } - state->distcode = (code const FAR *)(state->next); + state->distcode = (code const *)(state->next); state->distbits = 6; ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, &(state->next), &(state->distbits), state->work); |