Module Name: src Committed By: christos Date: Sat Jun 18 21:41:09 UTC 2016
Modified Files: src/external/cddl/osnet/dist/uts/common/zmod: deflate.c zconf.h zlib.h zutil.c zutil.h Log Message: fix dup definitions in module. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/uts/common/zmod/deflate.c \ src/external/cddl/osnet/dist/uts/common/zmod/zconf.h \ src/external/cddl/osnet/dist/uts/common/zmod/zlib.h \ src/external/cddl/osnet/dist/uts/common/zmod/zutil.c \ src/external/cddl/osnet/dist/uts/common/zmod/zutil.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dist/uts/common/zmod/deflate.c diff -u src/external/cddl/osnet/dist/uts/common/zmod/deflate.c:1.1.1.1 src/external/cddl/osnet/dist/uts/common/zmod/deflate.c:1.2 --- src/external/cddl/osnet/dist/uts/common/zmod/deflate.c:1.1.1.1 Fri Aug 7 14:34:41 2009 +++ src/external/cddl/osnet/dist/uts/common/zmod/deflate.c Sat Jun 18 17:41:08 2016 @@ -303,7 +303,7 @@ int ZEXPORT deflateInit2_(strm, level, m if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || s->pending_buf == Z_NULL) { s->status = FINISH_STATE; - strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); + strm->msg = zError(Z_MEM_ERROR); (void) deflateEnd (strm); return Z_MEM_ERROR; } Index: src/external/cddl/osnet/dist/uts/common/zmod/zconf.h diff -u src/external/cddl/osnet/dist/uts/common/zmod/zconf.h:1.1.1.1 src/external/cddl/osnet/dist/uts/common/zmod/zconf.h:1.2 --- src/external/cddl/osnet/dist/uts/common/zmod/zconf.h:1.1.1.1 Fri Aug 7 14:34:44 2009 +++ src/external/cddl/osnet/dist/uts/common/zmod/zconf.h Sat Jun 18 17:41:08 2016 @@ -94,6 +94,13 @@ extern "C" { #define crc32 z_crc32 #define get_crc_table z_get_crc_table #define zError z_zError +#define _tr_flush_block z__tr_flush_block +#define _length_code z__length_code +#define inflate_fast z_inflate_fast +#define _tr_stored_block z__tr_stored_block +#define _dist_code z__dist_code +#define _tr_init z__tr_init +#define _tr_align z__tr_align #define MAX_MEM_LEVEL 9 #define MAX_WBITS 15 Index: src/external/cddl/osnet/dist/uts/common/zmod/zlib.h diff -u src/external/cddl/osnet/dist/uts/common/zmod/zlib.h:1.1.1.1 src/external/cddl/osnet/dist/uts/common/zmod/zlib.h:1.2 --- src/external/cddl/osnet/dist/uts/common/zmod/zlib.h:1.1.1.1 Fri Aug 7 14:34:46 2009 +++ src/external/cddl/osnet/dist/uts/common/zmod/zlib.h Sat Jun 18 17:41:08 2016 @@ -90,7 +90,7 @@ typedef struct z_stream_s { uInt avail_out; /* remaining free space at next_out */ uLong total_out; /* total nb of bytes output so far */ - char *msg; /* last error message, NULL if no error */ + const char *msg; /* last error message, NULL if no error */ struct internal_state FAR *state; /* not visible by applications */ alloc_func zalloc; /* used to allocate the internal state */ Index: src/external/cddl/osnet/dist/uts/common/zmod/zutil.c diff -u src/external/cddl/osnet/dist/uts/common/zmod/zutil.c:1.1.1.1 src/external/cddl/osnet/dist/uts/common/zmod/zutil.c:1.2 --- src/external/cddl/osnet/dist/uts/common/zmod/zutil.c:1.1.1.1 Fri Aug 7 14:34:47 2009 +++ src/external/cddl/osnet/dist/uts/common/zmod/zutil.c Sat Jun 18 17:41:08 2016 @@ -16,7 +16,7 @@ struct internal_state {int dummy;}; /* for buggy compilers */ #endif -const char * const z_errmsg[10] = { +static const char * const z_errmsg[10] = { "need dictionary", /* Z_NEED_DICT 2 */ "stream end", /* Z_STREAM_END 1 */ "", /* Z_OK 0 */ Index: src/external/cddl/osnet/dist/uts/common/zmod/zutil.h diff -u src/external/cddl/osnet/dist/uts/common/zmod/zutil.h:1.1.1.1 src/external/cddl/osnet/dist/uts/common/zmod/zutil.h:1.2 --- src/external/cddl/osnet/dist/uts/common/zmod/zutil.h:1.1.1.1 Fri Aug 7 14:34:47 2009 +++ src/external/cddl/osnet/dist/uts/common/zmod/zutil.h Sat Jun 18 17:41:08 2016 @@ -55,13 +55,15 @@ typedef unsigned short ush; typedef ush FAR ushf; typedef unsigned long ulg; +#if 0 extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* (size given to avoid silly warnings with Visual C++) */ +#endif #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] #define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) + return (strm->msg = zError(err), (err)) /* To be used only when the state is known to be valid */ /* common constants */