notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix a name clash with newer zlib
[picodrive.git]
/
pico
/
cart.c
diff --git
a/pico/cart.c
b/pico/cart.c
index
3bab615
..
25a847d
100644
(file)
--- a/
pico/cart.c
+++ b/
pico/cart.c
@@
-50,7
+50,7
@@
typedef struct _cso_struct
}
\r
cso_struct;
\r
\r
}
\r
cso_struct;
\r
\r
-static int uncompress
2
(void *dest, int destLen, void *source, int sourceLen)
\r
+static int uncompress
_buf
(void *dest, int destLen, void *source, int sourceLen)
\r
{
\r
z_stream stream;
\r
int err;
\r
{
\r
z_stream stream;
\r
int err;
\r
@@
-298,7
+298,7
@@
size_t pm_read(void *ptr, size_t bytes, pm_file *stream)
}
\r
cso->block_in_buff = block;
\r
}
\r
}
\r
cso->block_in_buff = block;
\r
}
\r
- rret = uncompress
2
(tmp_dst, 2048, cso->in_buff, read_len);
\r
+ rret = uncompress
_buf
(tmp_dst, 2048, cso->in_buff, read_len);
\r
if (rret != 0) {
\r
elprintf(EL_STATUS, "cso: uncompress failed @ %08x with %i", read_pos, rret);
\r
break;
\r
if (rret != 0) {
\r
elprintf(EL_STATUS, "cso: uncompress failed @ %08x with %i", read_pos, rret);
\r
break;
\r
@@
-332,9
+332,7
@@
int pm_seek(pm_file *stream, long offset, int whence)
if (stream->type == PMT_UNCOMPRESSED)
\r
{
\r
fseek(stream->file, offset, whence);
\r
if (stream->type == PMT_UNCOMPRESSED)
\r
{
\r
fseek(stream->file, offset, whence);
\r
- int ret = ftell(stream->file);
\r
- elprintf(EL_STATUS, "seeked ok."); //HACK for VITA
\r
- return ret;
\r
+ return ftell(stream->file);
\r
}
\r
#ifndef NO_ZLIB
\r
else if (stream->type == PMT_ZIP)
\r
}
\r
#ifndef NO_ZLIB
\r
else if (stream->type == PMT_ZIP)
\r