diff options
Diffstat (limited to 'tinySIGCOMP/src/zutil.c')
| -rwxr-xr-x | tinySIGCOMP/src/zutil.c | 186 |
1 files changed, 118 insertions, 68 deletions
diff --git a/tinySIGCOMP/src/zutil.c b/tinySIGCOMP/src/zutil.c index dab7e2f..49b430e 100755 --- a/tinySIGCOMP/src/zutil.c +++ b/tinySIGCOMP/src/zutil.c @@ -9,20 +9,23 @@ #include "zutil.h" #ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ +struct internal_state { + int dummy; +}; /* for buggy compilers */ #endif const char * const z_errmsg[10] = { -"need dictionary", /* Z_NEED_DICT 2 */ -"stream end", /* Z_STREAM_END 1 */ -"", /* Z_OK 0 */ -"file error", /* Z_ERRNO (-1) */ -"stream error", /* Z_STREAM_ERROR (-2) */ -"data error", /* Z_DATA_ERROR (-3) */ -"insufficient memory", /* Z_MEM_ERROR (-4) */ -"buffer error", /* Z_BUF_ERROR (-5) */ -"incompatible version",/* Z_VERSION_ERROR (-6) */ -""}; + "need dictionary", /* Z_NEED_DICT 2 */ + "stream end", /* Z_STREAM_END 1 */ + "", /* Z_OK 0 */ + "file error", /* Z_ERRNO (-1) */ + "stream error", /* Z_STREAM_ERROR (-2) */ + "data error", /* Z_DATA_ERROR (-3) */ + "insufficient memory", /* Z_MEM_ERROR (-4) */ + "buffer error", /* Z_BUF_ERROR (-5) */ + "incompatible version",/* Z_VERSION_ERROR (-6) */ + "" +}; const char * ZEXPORT zlibVersion() @@ -36,28 +39,52 @@ uLong ZEXPORT zlibCompileFlags() flags = 0; switch (sizeof(uInt)) { - case 2: break; - case 4: flags += 1; break; - case 8: flags += 2; break; - default: flags += 3; + case 2: + break; + case 4: + flags += 1; + break; + case 8: + flags += 2; + break; + default: + flags += 3; } switch (sizeof(uLong)) { - case 2: break; - case 4: flags += 1 << 2; break; - case 8: flags += 2 << 2; break; - default: flags += 3 << 2; + case 2: + break; + case 4: + flags += 1 << 2; + break; + case 8: + flags += 2 << 2; + break; + default: + flags += 3 << 2; } switch (sizeof(voidpf)) { - case 2: break; - case 4: flags += 1 << 4; break; - case 8: flags += 2 << 4; break; - default: flags += 3 << 4; + case 2: + break; + case 4: + flags += 1 << 4; + break; + case 8: + flags += 2 << 4; + break; + default: + flags += 3 << 4; } switch (sizeof(z_off_t)) { - case 2: break; - case 4: flags += 1 << 6; break; - case 8: flags += 2 << 6; break; - default: flags += 3 << 6; + case 2: + break; + case 4: + flags += 1 << 6; + break; + case 8: + flags += 2 << 6; + break; + default: + flags += 3 << 6; } #ifdef DEBUG flags += 1 << 8; @@ -88,25 +115,25 @@ uLong ZEXPORT zlibCompileFlags() #endif #ifdef STDC # ifdef NO_vsnprintf - flags += 1L << 25; + flags += 1L << 25; # ifdef HAS_vsprintf_void - flags += 1L << 26; + flags += 1L << 26; # endif # else # ifdef HAS_vsnprintf_void - flags += 1L << 26; + flags += 1L << 26; # endif # endif #else - flags += 1L << 24; + flags += 1L << 24; # ifdef NO_snprintf - flags += 1L << 25; + flags += 1L << 25; # ifdef HAS_sprintf_void - flags += 1L << 26; + flags += 1L << 26; # endif # else # ifdef HAS_snprintf_void - flags += 1L << 26; + flags += 1L << 26; # endif # endif #endif @@ -121,7 +148,7 @@ uLong ZEXPORT zlibCompileFlags() int z_verbose = verbose; void z_error (m) - char *m; +char *m; { fprintf(stderr, "%s\n", m); exit(1); @@ -132,53 +159,61 @@ void z_error (m) * uncompress() */ const char * ZEXPORT zError(err) - int err; +int err; { return ERR_MSG(err); } #if defined(_WIN32_WCE) - /* The Microsoft C Run-Time Library for Windows CE doesn't have - * errno. We define it as a global variable to simplify porting. - * Its value is always 0 and should not be used. - */ - int errno = 0; +/* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. + */ +int errno = 0; #endif #ifndef HAVE_MEMCPY void zmemcpy(dest, source, len) - Bytef* dest; - const Bytef* source; - uInt len; +Bytef* dest; +const Bytef* source; +uInt len; { - if (len == 0) return; + if (len == 0) { + return; + } do { *dest++ = *source++; /* ??? to be unrolled */ - } while (--len != 0); + } + while (--len != 0); } int zmemcmp(s1, s2, len) - const Bytef* s1; - const Bytef* s2; - uInt len; +const Bytef* s1; +const Bytef* s2; +uInt len; { uInt j; for (j = 0; j < len; j++) { - if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; + if (s1[j] != s2[j]) { + return 2*(s1[j] > s2[j])-1; + } } return 0; } void zmemzero(dest, len) - Bytef* dest; - uInt len; +Bytef* dest; +uInt len; { - if (len == 0) return; + if (len == 0) { + return; + } do { *dest++ = 0; /* ??? to be unrolled */ - } while (--len != 0); + } + while (--len != 0); } #endif @@ -224,11 +259,16 @@ voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) */ if (bsize < 65520L) { buf = farmalloc(bsize); - if (*(ush*)&buf != 0) return buf; - } else { + if (*(ush*)&buf != 0) { + return buf; + } + } + else { buf = farmalloc(bsize + 16L); } - if (buf == NULL || next_ptr >= MAX_PTR) return NULL; + if (buf == NULL || next_ptr >= MAX_PTR) { + return NULL; + } table[next_ptr].org_ptr = buf; /* Normalize the pointer to seg:0 */ @@ -247,7 +287,9 @@ void zcfree (voidpf opaque, voidpf ptr) } /* Find the original pointer */ for (n = 0; n < next_ptr; n++) { - if (ptr != table[n].new_ptr) continue; + if (ptr != table[n].new_ptr) { + continue; + } farfree(table[n].org_ptr); while (++n < next_ptr) { @@ -275,13 +317,17 @@ void zcfree (voidpf opaque, voidpf ptr) voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) { - if (opaque) opaque = 0; /* to make compiler happy */ + if (opaque) { + opaque = 0; /* to make compiler happy */ + } return _halloc((long)items, size); } void zcfree (voidpf opaque, voidpf ptr) { - if (opaque) opaque = 0; /* to make compiler happy */ + if (opaque) { + opaque = 0; /* to make compiler happy */ + } _hfree(ptr); } @@ -299,21 +345,25 @@ extern void free OF((voidpf ptr)); #endif voidpf zcalloc (opaque, items, size) - voidpf opaque; - unsigned items; - unsigned size; +voidpf opaque; +unsigned items; +unsigned size; { - if (opaque) items += size - size; /* make compiler happy */ + if (opaque) { + items += size - size; /* make compiler happy */ + } return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : - (voidpf)calloc(items, size); + (voidpf)calloc(items, size); } void zcfree (opaque, ptr) - voidpf opaque; - voidpf ptr; +voidpf opaque; +voidpf ptr; { free(ptr); - if (opaque) return; /* make compiler happy */ + if (opaque) { + return; /* make compiler happy */ + } } #endif /* MY_ZCALLOC */ |
