summaryrefslogtreecommitdiffstats
path: root/libdimension/object.c
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2010-04-07 14:26:15 -0400
committerTavian Barnes <tavianator@gmail.com>2010-04-07 14:34:52 -0400
commit2b087cb45ae91f90492a935625570d7d42ee3ecb (patch)
treea464213b08d04c8c91c8879a84e534f895c84378 /libdimension/object.c
parent7d6663eeb68bf9d0a3dff86128827c0c1d85df69 (diff)
downloaddimension-2b087cb45ae91f90492a935625570d7d42ee3ecb.tar.xz
New dmnsn_malloc() function, and friends.
I'm tired of checking for malloc failures everywhere, considering it never happens. So just bail out whenever it does. A lot of stuff is guaranteed to succeed if it returns now.
Diffstat (limited to 'libdimension/object.c')
-rw-r--r--libdimension/object.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/libdimension/object.c b/libdimension/object.c
index 9f17971..51db42f 100644
--- a/libdimension/object.c
+++ b/libdimension/object.c
@@ -20,16 +20,12 @@
#include "dimension.h"
#include <errno.h>
-#include <stdlib.h> /* For malloc */
-/* Allocate an intersection - cannot fail */
+/* Allocate an intersection */
dmnsn_intersection *
dmnsn_new_intersection()
{
- dmnsn_intersection *intersection = malloc(sizeof(dmnsn_intersection));
- if (!intersection) {
- dmnsn_error(DMNSN_SEVERITY_HIGH, "Couldn't allocate an intersection.");
- }
+ dmnsn_intersection *intersection = dmnsn_malloc(sizeof(dmnsn_intersection));
return intersection;
}
@@ -44,15 +40,11 @@ dmnsn_delete_intersection(dmnsn_intersection *intersection)
dmnsn_object *
dmnsn_new_object()
{
- dmnsn_object *object = malloc(sizeof(dmnsn_object));
- if (object) {
- object->texture = NULL;
- object->interior = NULL;
- object->trans = dmnsn_identity_matrix();
- object->free_fn = NULL;
- } else {
- errno = ENOMEM;
- }
+ dmnsn_object *object = dmnsn_malloc(sizeof(dmnsn_object));
+ object->texture = NULL;
+ object->interior = NULL;
+ object->trans = dmnsn_identity_matrix();
+ object->free_fn = NULL;
return object;
}