From 2b087cb45ae91f90492a935625570d7d42ee3ecb Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 7 Apr 2010 14:26:15 -0400 Subject: 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. --- libdimension/phong.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'libdimension/phong.c') diff --git a/libdimension/phong.c b/libdimension/phong.c index 8188488..ae7b2ce 100644 --- a/libdimension/phong.c +++ b/libdimension/phong.c @@ -20,7 +20,6 @@ #include "dimension.h" #include -#include /* For malloc */ #include /* @@ -55,20 +54,14 @@ dmnsn_finish * dmnsn_new_phong_finish(double specular, double exp) { dmnsn_finish *finish = dmnsn_new_finish(); - if (finish) { - double *params = malloc(2*sizeof(double)); - if (!params) { - dmnsn_delete_finish(finish); - errno = ENOMEM; - return NULL; - } - params[0] = specular; - params[1] = exp; + double *params = dmnsn_malloc(2*sizeof(double)); + params[0] = specular; + params[1] = exp; + + finish->ptr = params; + finish->specular_fn = &dmnsn_phong_specular_fn; + finish->free_fn = &free; - finish->ptr = params; - finish->specular_fn = &dmnsn_phong_specular_fn; - finish->free_fn = &free; - } return finish; } -- cgit v1.2.3