From 111d144174adf2e7ed7272912315eb60d9e0fd26 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Mon, 16 Oct 2023 14:53:56 -0400
Subject: tk: Use goto for render errors

---
(limited to 'src/tk/box.c')

diff --git a/src/tk/box.c b/src/tk/box.c
index fd6c071..976aeb1 100644
--- a/src/tk/box.c
+++ b/src/tk/box.c
@@ -108,18 +108,12 @@ _mftk_box_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y)
 	if (SDL_SetRenderDrawColor(renderer,
 				MFTK_COLOR_FBDR_R, MFTK_COLOR_FBDR_G,
 				MFTK_COLOR_FBDR_B, MFTK_COLOR_FBDR_A) < 0) {
-		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-				"Couldn't render widget: %s",
-				SDL_GetError());
-		return -1;
+		goto err;
 	}
 #define _mftk_edge(X, Y, W, H) \
 	edge.x = X, edge.y = Y, edge.w = W, edge.h = H; \
 	if (SDL_RenderFillRect(renderer, &edge) < 0) { \
-		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, \
-				"Couldn't render widget: %s", \
-				SDL_GetError()); \
-		return -1; \
+		goto err; \
 	}
 	_mftk_edge(outer.x          , outer.y          , outer.w  , b->border);
 	_mftk_edge(outer.x          , inner.y + inner.h, outer.w  , b->border);
@@ -132,10 +126,7 @@ _mftk_box_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y)
 				MFTK_COLOR_FORM_R, MFTK_COLOR_FORM_G,
 				MFTK_COLOR_FORM_B, MFTK_COLOR_FORM_A) < 0 ||
 			SDL_RenderFillRect(renderer, &inner) < 0) {
-		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-				"Couldn't render widget: %s",
-				SDL_GetError());
-		return -1;
+		goto err;
 	}
 
 	/* Child widget */
@@ -145,6 +136,11 @@ _mftk_box_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y)
 	}
 
 	return 0;
+
+ err:
+	SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+			"Couldn't render widget: %s", SDL_GetError());
+	return -1;
 }
 
 static void
--
cgit v0.9.1