notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git subrepo pull (merge) --force deps/libchdr
[pcsx_rearmed.git]
/
deps
/
libchdr
/
deps
/
zlib-1.3.1
/
contrib
/
infback9
/
infback9.c
diff --git
a/deps/libchdr/deps/zlib-1.2.13/contrib/infback9/infback9.c
b/deps/libchdr/deps/zlib-1.3.1/contrib/infback9/infback9.c
similarity index 98%
rename from
deps/libchdr/deps/zlib-1.2.13/contrib/infback9/infback9.c
rename to
deps/libchdr/deps/zlib-1.3.1/contrib/infback9/infback9.c
index
05fb3e3
..
742a392
100644
(file)
--- a/
deps/libchdr/deps/zlib-1.2.13/contrib/infback9/infback9.c
+++ b/
deps/libchdr/deps/zlib-1.3.1/contrib/infback9/infback9.c
@@
-16,12
+16,8
@@
window is a user-supplied window and output buffer that is 64K bytes.
*/
window is a user-supplied window and output buffer that is 64K bytes.
*/
-int ZEXPORT inflateBack9Init_(strm, window, version, stream_size)
-z_stream FAR *strm;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
+int ZEXPORT inflateBack9Init_(z_stream FAR *strm, unsigned char FAR *window,
+ const char *version, int stream_size) {
struct inflate_state FAR *state;
if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
struct inflate_state FAR *state;
if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
@@
-51,8
+47,7
@@
int stream_size;
#ifdef MAKEFIXED
#include <stdio.h>
#ifdef MAKEFIXED
#include <stdio.h>
-void makefixed9(void)
-{
+void makefixed9(void) {
unsigned sym, bits, low, size;
code *next, *lenfix, *distfix;
struct inflate_state state;
unsigned sym, bits, low, size;
code *next, *lenfix, *distfix;
struct inflate_state state;
@@
-214,13
+209,8
@@
void makefixed9(void)
inflateBack() can also return Z_STREAM_ERROR if the input parameters
are not correct, i.e. strm is Z_NULL or the state was not initialized.
*/
inflateBack() can also return Z_STREAM_ERROR if the input parameters
are not correct, i.e. strm is Z_NULL or the state was not initialized.
*/
-int ZEXPORT inflateBack9(strm, in, in_desc, out, out_desc)
-z_stream FAR *strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
+int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
+ out_func out, void FAR *out_desc) {
struct inflate_state FAR *state;
z_const unsigned char FAR *next; /* next input */
unsigned char FAR *put; /* next output */
struct inflate_state FAR *state;
z_const unsigned char FAR *next; /* next input */
unsigned char FAR *put; /* next output */
@@
-603,9
+593,7
@@
void FAR *out_desc;
return ret;
}
return ret;
}
-int ZEXPORT inflateBack9End(strm)
-z_stream FAR *strm;
-{
+int ZEXPORT inflateBack9End(z_stream FAR *strm) {
if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
return Z_STREAM_ERROR;
ZFREE(strm, strm->state);
if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
return Z_STREAM_ERROR;
ZFREE(strm, strm->state);