Skip to content

Fix GCC 15 warnings #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uyjulian merged 1 commit into from
May 20, 2025
Merged

Fix GCC 15 warnings #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/lzma/LzmaEnc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2832,7 +2832,7 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
CLzmaEnc *p = (CLzmaEnc *)pp;
UInt64 nowPos64;
SRes res;
CLzmaEnc_SeqOutStreamBuf outStream;
static CLzmaEnc_SeqOutStreamBuf outStream;

outStream.vt.Write = SeqOutStreamBuf_Write;
outStream.data = dest;
Expand Down
2 changes: 1 addition & 1 deletion stub/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SUBMAKE = $(MAKE) -C

include $(PS2SDK)/Defs.make

EE_CPPFLAGS = -G0 -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I . -I zlib -I lzo -I lz4 -I ../common/lzma -D_EE -O3 -Wall -DDO_EXECPS2
EE_CPPFLAGS = -G0 -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I . -I zlib -I lzo -I lz4 -I ../common/lzma -D_EE -O3 -Wall -Werror -DDO_EXECPS2
EE_LDFLAGS = -T ./linkfile -L $(PS2SDK)/ee/lib -lc_nano -lkernel

TARGETS = \
Expand Down
2 changes: 1 addition & 1 deletion stub/lz4/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include $(PS2SDK)/Defs.make

EE_CPPFLAGS = -G0 -I . -D_EE -O3 -Wall -DLSB_FIRST -DALIGN_DWORD -DLZ4_FORCE_SW_BITCOUNT
EE_CPPFLAGS = -G0 -I . -D_EE -O3 -Wall -Werror -DLSB_FIRST -DALIGN_DWORD -DLZ4_FORCE_SW_BITCOUNT

OBJS = lz4.o

Expand Down
2 changes: 1 addition & 1 deletion stub/lzma/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ EE_OBJS_DIR = obj/
EE_LIB_DIR =
SRC_DIR = ../../common/lzma/

EE_CPPFLAGS = -G0 -I $(SRC_DIR) -D_EE -Os -Wall -D_LZMA_SIZE_OPT
EE_CPPFLAGS = -G0 -I $(SRC_DIR) -D_EE -Os -Wall -Werror -D_LZMA_SIZE_OPT

EE_OBJS = Alloc.o LzFind.o LzmaDec.o LzmaEnc.o

Expand Down
2 changes: 1 addition & 1 deletion stub/lzo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include $(PS2SDK)/Defs.make

EE_CPPFLAGS = -G0 -I . -D_EE -O3 -Wall -DLSB_FIRST -DALIGN_DWORD
EE_CPPFLAGS = -G0 -I . -D_EE -O3 -Wall -Werror -DLSB_FIRST -DALIGN_DWORD

OBJS = minilzo.o

Expand Down
2 changes: 1 addition & 1 deletion stub/zlib/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include $(PS2SDK)/Defs.make

EE_CPPFLAGS = -G0 -I . -D_EE -O3 -Wall -DNO_GZIP -DBUILDFIXED -DNO_vsnprintf
EE_CPPFLAGS = -G0 -I . -D_EE -O3 -Wall -Werror -DNO_GZIP -DBUILDFIXED -DNO_vsnprintf

OBJS = adler32.o zutil.o inflate.o inffast.o inftrees.o

Expand Down
40 changes: 20 additions & 20 deletions stub/zlib/adler32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
#endif

/* ========================================================================= */
uLong ZEXPORT adler32(adler, buf, len)
uLong adler;
const Bytef *buf;
uInt len;
{
uLong ZEXPORT adler32(
uLong adler,
const Bytef *buf,
uInt len
) {
unsigned long sum2;
unsigned n;

Expand Down Expand Up @@ -133,11 +133,11 @@ uLong ZEXPORT adler32(adler, buf, len)
}

/* ========================================================================= */
local uLong adler32_combine_(adler1, adler2, len2)
uLong adler1;
uLong adler2;
z_off64_t len2;
{
local uLong adler32_combine_(
uLong adler1,
uLong adler2,
z_off64_t len2
) {
unsigned long sum1;
unsigned long sum2;
unsigned rem;
Expand All @@ -162,18 +162,18 @@ local uLong adler32_combine_(adler1, adler2, len2)
}

/* ========================================================================= */
uLong ZEXPORT adler32_combine(adler1, adler2, len2)
uLong adler1;
uLong adler2;
z_off_t len2;
{
uLong ZEXPORT adler32_combine(
uLong adler1,
uLong adler2,
z_off_t len2
) {
return adler32_combine_(adler1, adler2, len2);
}

uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
uLong adler1;
uLong adler2;
z_off64_t len2;
{
uLong ZEXPORT adler32_combine64(
uLong adler1,
uLong adler2,
z_off64_t len2
) {
return adler32_combine_(adler1, adler2, len2);
}
8 changes: 4 additions & 4 deletions stub/zlib/inffast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
requires strm->avail_out >= 258 for each loop to avoid checking for
output space.
*/
void ZLIB_INTERNAL inflate_fast(strm, start)
z_streamp strm;
unsigned start; /* inflate()'s starting value for strm->avail_out */
{
void ZLIB_INTERNAL inflate_fast(
z_streamp strm,
unsigned start /* inflate()'s starting value for strm->avail_out */
) {
struct inflate_state FAR *state;
z_const unsigned char FAR *in; /* local strm->next_in */
z_const unsigned char FAR *last; /* have enough input while in < last */
Expand Down
Loading