popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

port: 64-bit cleanup: remove exit()/fprintf()

Browse Source
This commit is contained in:
fgsfds committed 2024-11-10 10:53:59 +01:00
1 parent f37abc941e
commit 23539a02a5
9 files changed
+13 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

port/src/preprocess/common.c
+1 -2
View File
@@ -7,8 +7,7 @@ static int m_NumPtrMarkers;
void addMarker(u32 ptr_src, uintptr_t ptr_host)
{
if (m_NumPtrMarkers >= ARRAYCOUNT(m_PtrMarkers)) {
sysLogPrintf(LOG_ERROR, "Marker limit exceeded");
exit(EXIT_FAILURE);
sysFatalError("Marker limit exceeded");
}
m_PtrMarkers[m_NumPtrMarkers].ptr_src = ptr_src;
port/src/preprocess/common.h
+1 -1
View File
@@ -26,7 +26,7 @@
#include "types.h"
#include "constants.h"
#include "system.h"
#if __BIG_ENDIAN__
#define htonll(x) (x)
port/src/preprocess/filebg.c
+3 -6
View File
@@ -306,8 +306,7 @@ void relinkPtr(uintptr_t* ptr)
struct ptrmarker* marker = findPtrMarker(*ptr);
if (!marker) {
fprintf(stderr, "[BG] WARNING: Unable to relink pointer: %p\n", ptr);
exit(EXIT_FAILURE);
sysFatalError("[BG] WARNING: Unable to relink pointer: %p\n", ptr);
}
*ptr = marker->ptr_host;
@@ -554,8 +553,7 @@ void preprocessBgSection1(u8 *data, u32 size, u32 ofs)
u32 newSize = convertSection1(dst, data, ofs);
if (newSize > size) {
sysLogPrintf(LOG_ERROR, "overflow when trying to preprocess a bg file, size %d newsize %d", size, newSize);
exit(EXIT_FAILURE);
sysFatalError("overflow when trying to preprocess a bg file, size %d newsize %d", size, newSize);
}
memcpy(data, dst, newSize);
@@ -569,8 +567,7 @@ u32 preprocessBgRoom(u8 *data, u32 size, u32 room_ofs)
u32 newSize = convertRoomGfxData(dst, data, size, room_ofs);
if (newSize > size) {
sysLogPrintf(LOG_ERROR, "overflow when trying to preprocess a bg room, size %d newsize %d", size, newSize);
exit(EXIT_FAILURE);
sysFatalError("overflow when trying to preprocess a bg room, size %d newsize %d", size, newSize);
}
memcpy(data, dst, newSize);
port/src/preprocess/filelang.c
+1 -2
View File
@@ -82,8 +82,7 @@ u8 *preprocessLangFile(u8 *data, u32 size, u32 *outSize) {
u32 newSize = convertLangFile(dst, data, size);
if (newSize > newSizeEstimated) {
sysLogPrintf(LOG_ERROR, "overflow when trying to preprocess a lang file, size %d newsize %d", size, newSize);
exit(EXIT_FAILURE);
sysFatalError("overflow when trying to preprocess a lang file, size %d newsize %d", size, newSize);
}
memcpy(data, dst, newSize);
port/src/preprocess/filemodel.c
+3 -6
View File
@@ -349,8 +349,7 @@ static void set_marker(u32 src_offset, enum contenttype type, u32 parent_src_off
}
if (m_NumMarkers >= ARRAYCOUNT(m_Markers)) {
fprintf(stderr, "Marker limit exceeded\n");
exit(EXIT_FAILURE);
sysFatalError("Marker limit exceeded");
}
m_Markers[m_NumMarkers].src_offset = src_offset;
@@ -994,8 +993,7 @@ u8 *preprocessModelFile(u8 *data, u32 size, u32 *outSize)
u32 newSize = convertModel(dst, data, size);
if (newSize > newSizeEstimated) {
sysLogPrintf(LOG_ERROR, "overflow when trying to preprocess model, size %d newsize %d", size, newSize);
exit(EXIT_FAILURE);
sysFatalError("overflow when trying to preprocess model, size %d newsize %d", size, newSize);
}
memcpy(data, dst, newSize);
@@ -1016,8 +1014,7 @@ u8 *preprocessGunFile(u8 *data, u32 size, u32 *outSize)
u32 newSize = convertModel(dst, data, size);
if (newSize > newSizeEstimated) {
sysLogPrintf(LOG_ERROR, "overflow when trying to preprocess model, size %d newsize %d", size, newSize);
exit(EXIT_FAILURE);
sysFatalError("overflow when trying to preprocess model, size %d newsize %d", size, newSize);
}
memcpy(data, dst, newSize);
port/src/preprocess/filepads.c
+1 -2
View File
@@ -316,8 +316,7 @@ u8* preprocessPadsFile(u8 *data, u32 size, u32 *outSize) {
u32 newSize = convertPadsFile(dst, data);
if (newSize > newSizeEstimated) {
sysLogPrintf(LOG_ERROR, "overflow when trying to preprocess a pads file, size %d newsize %d", size, newSize);
exit(EXIT_FAILURE);
sysFatalError("overflow when trying to preprocess a pads file, size %d newsize %d", size, newSize);
}
memcpy(data, dst, newSize);
port/src/preprocess/filesetup.c
+1 -2
View File
@@ -1187,8 +1187,7 @@ u8 *preprocessSetupFile(u8 *data, u32 size, u32 *outSize) {
u32 newSize = convertSetup(dst, data, size);
if (newSize > newSizeEstimated) {
sysLogPrintf(LOG_ERROR, "overflow when trying to preprocess a model file, size %d newsize %d", size, newSize);
exit(EXIT_FAILURE);
sysFatalError("overflow when trying to preprocess a model file, size %d newsize %d", size, newSize);
}
memcpy(data, dst, newSize);
port/src/preprocess/filetiles.c
+1 -2
View File
@@ -94,8 +94,7 @@ u8 *preprocessTilesFile(u8 *data, u32 size, u32 *outSize)
u32 newSize = convertTiles(dst, data, size);
if (newSize > newSizeEstimated) {
sysLogPrintf(LOG_ERROR, "overflow when trying to preprocess a tiles file, size %d newsize %d", size, newSize);
exit(EXIT_FAILURE);
sysFatalError("overflow when trying to preprocess a tiles file, size %d newsize %d", size, newSize);
}
memcpy(data, dst, newSize);
port/src/preprocess/util_gbi.c
+1 -2
View File
@@ -129,8 +129,7 @@ static u64 gbiRewriteAddr(u64 cmd, u8 opcode)
}
else {
if (offset < m_SrcVtxOffset) {
printf("Tried to load data from offset 0x%x but segment starts at 0x%x\n", offset, m_SrcVtxOffset);
exit(EXIT_FAILURE);
sysFatalError("Tried to load data from offset 0x%x but segment starts at 0x%x\n", offset, m_SrcVtxOffset);
}
offset = offset - m_SrcVtxOffset + m_DstVtxOffset;