From c6612fb215d71ac2bea3b614786cf585cd1a6c74 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 26 Oct 2009 00:25:21 -0400 Subject: Clean up some dmnsn_new_*() functions. Rather than special-case every failed memory allocation, just make dmnsn_delete_*() more robust and call it. --- libdimension/canvas.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libdimension/canvas.c') diff --git a/libdimension/canvas.c b/libdimension/canvas.c index 1d74a33..eacd8f6 100644 --- a/libdimension/canvas.c +++ b/libdimension/canvas.c @@ -34,15 +34,15 @@ dmnsn_new_canvas(unsigned int x, unsigned int y) canvas->x = x; canvas->y = y; + /* Allocate room for the optimizers */ + canvas->optimizers = dmnsn_new_array(sizeof(dmnsn_canvas_optimizer)); + /* Allocate the pixels */ canvas->pixels = malloc(sizeof(dmnsn_color)*x*y); if (!canvas->pixels) { - free(canvas); + dmnsn_delete_canvas(canvas); return NULL; } - - /* Allocate room for the optimizers */ - canvas->optimizers = dmnsn_new_array(sizeof(dmnsn_canvas_optimizer)); } return canvas; -- cgit v1.2.3