summaryrefslogtreecommitdiffhomepage
path: root/src/extmalloc.c
diff options
context:
space:
mode:
authorMichael Smith <mikesmiffy128@gmail.com>2024-08-03 23:40:31 +0100
committerMichael Smith <mikesmiffy128@gmail.com>2024-08-23 20:37:37 +0100
commit83da606072ce272eb053d4e1497d77e647cfecae (patch)
tree71d0110881ff8685184c5f4ab720cc8d49c24678 /src/extmalloc.c
parentacbd30e0427b16f885f96aed59881ec04eff25bc (diff)
Revise syntax macros and add a ton of branch hints
My new programming style is branch hints. All non-confusing branches must be hinted when I can be bothered. It's faster, sometimes, maybe. Also, start trying to use more signed sizes in at least some of the places where it makes sense. Unsigned sizes are surprisingly error-prone!
Diffstat (limited to 'src/extmalloc.c')
-rw-r--r--src/extmalloc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/extmalloc.c b/src/extmalloc.c
index a23dc2a..d80ab8d 100644
--- a/src/extmalloc.c
+++ b/src/extmalloc.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2023 Michael Smith <mikesmiffy128@gmail.com>
+ * Copyright © 2024 Michael Smith <mikesmiffy128@gmail.com>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -41,6 +41,8 @@ void extfree(void *mem) { Free(g_pMemAlloc, mem); }
#else
+#include "langext.h"
+
void Error(const char *fmt, ...); // stub left out of con_.h (not that useful)
// Linux Source doesn't seem to bother with the custom allocator stuff at all.
@@ -48,15 +50,16 @@ void Error(const char *fmt, ...); // stub left out of con_.h (not that useful)
// right, not a privilege. Like func_vehicle.
void *extmalloc(usize sz) {
void *ret = malloc(sz);
- if (!ret) Error("sst: out of memory");
+ if_cold (!ret) Error("sst: out of memory");
return ret;
}
void *extrealloc(void *mem, usize sz) {
void *ret = realloc(mem, sz);
- if (!ret) Error("sst: out of memory");
+ if_cold (!ret) Error("sst: out of memory");
return ret;
}
// note: extfree is #defined to free in the header
+
#endif
// vi: sw=4 ts=4 noet tw=80 cc=80