asserts and cleanup

1 files changed, 10 insertions, 3 deletions

diff --git a/snag/src/util.c b/snag/src/util.c
index df1a8fd..025e583 100644
--- a/snag/src/util.c
+++ b/snag/src/util.c
@@ -8,7 +8,7 @@
 #if !DEBUG
 void die(const char* format, ...) {
 #else
-void _die(int line, const char* file, const char* format, ...) {
+void _die(const char* file, int line, const char* format, ...) {
 	fprintf(stderr, "%s:%d: error: ", file, line);
 #endif
     va_list args;
@@ -26,13 +26,20 @@ void* emalloc(size_t size, char* alloc_reason) {
 	return d;
 }
 #else
-void* _emalloc(int line, const char* file, size_t size, char* alloc_reason) {
+void* _emalloc(const char* file, int line, size_t size, char* alloc_reason) {
 	void* d = malloc(size);
-	if (d == NULL) _die(line, file, "failed to allocate '%s': %s", alloc_reason, strerror(errno));
+	if (d == NULL) _die(file, line, "failed to allocate '%s': %s", alloc_reason, strerror(errno));
 	return d;
 }
 #endif
 
+#if DEBUG
+void _failassert(const char* file, int line, char* contents) {
+	fprintf(stderr, "%s:%d: assertion failed: '%s'", file, line, contents);
+	exit(1);
+}
+#endif
+
 void printout(const char* format, ...) {
     va_list args;
     va_start(args, format);