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/check.c')

diff --git a/src/tk/check.c b/src/tk/check.c
index fd23b6a..c1defa2 100644
--- a/src/tk/check.c
+++ b/src/tk/check.c
@@ -170,9 +170,6 @@ _mftk_check_render_box(SDL_Rect *rect, SDL_Color *color, SDL_Renderer *renderer)
 	if (SDL_SetRenderDrawColor(renderer,
 				color->r, color->g, color->b, color->a) < 0 ||
 			SDL_RenderFillRect(renderer, rect) < 0) {
-		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-				"Couldn't render widget: %s",
-				SDL_GetError());
 		return -1;
 	}
 
@@ -190,9 +187,6 @@ _mftk_check_render_cir(SDL_Rect *rect, SDL_Color *color, SDL_Renderer *renderer)
 
 	if (SDL_SetRenderDrawColor(renderer,
 				color->r, color->g, color->b, color->a) < 0) {
-		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-				"Couldn't render widget: %s",
-				SDL_GetError());
 		e = -1;
 	}
 
@@ -200,9 +194,6 @@ _mftk_check_render_cir(SDL_Rect *rect, SDL_Color *color, SDL_Renderer *renderer)
 	do { \
 		if (SDL_RenderDrawPoint(renderer, \
 					rect->x + r + X, rect->y + r + Y) < 0){\
-			SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, \
-					"Couldn't render widget: %s", \
-					SDL_GetError()); \
 			e = -1; \
 		} \
 	} while (0)
@@ -232,7 +223,6 @@ _mftk_check_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y)
 	int               (*render)(SDL_Rect *, SDL_Color *, SDL_Renderer *);
 	SDL_Rect            rect;
 	SDL_Color          *border;
-	int                 e = 0;
 
 	if (c->shape == MFTK_CHECK_SHAPE_BOX) {
 		render = &_mftk_check_render_box;
@@ -250,7 +240,7 @@ _mftk_check_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y)
 		border = &_mftk_check_bdrn_color;
 	}
 	if (render(&rect, border, renderer) < 0) {
-		e = -1;
+		goto err;
 	}
 
 	rect.x += c->butn_border;
@@ -258,7 +248,7 @@ _mftk_check_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y)
 	rect.w -= c->butn_border * 2;
 	rect.h -= c->butn_border * 2;
 	if (render(&rect, &_mftk_check_butn_color, renderer) < 0) {
-			e = -1;
+		goto err;
 	}
 
 	if (c->state == SDL_TRUE) {
@@ -267,16 +257,21 @@ _mftk_check_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y)
 		rect.w -= c->butn_padding * 2;
 		rect.h -= c->butn_padding * 2;
 		if (render(&rect, &_mftk_check_mark_color, renderer) < 0) {
-			e = -1;
+			goto err;
 		}
 	}
 
 	if (c->label != NULL && mftk_widget_render(c->label, renderer,
 				x + c->butn_width + c->label_padding, y) < 0) {
-		e = -1;
+		goto err;
 	}
 
-	return e;
+	return 0;
+
+ err:
+	SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+			"Couldn't render widget: %s", SDL_GetError());
+	return -1;
 }
 
 static void
--
cgit v0.9.1