From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 20 Jun 2019 11:45:28 +0000 (+0200)
Subject: modules/sd_watchdog nitpick: detect more errors
X-Git-Tag: v4.1.0~17^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc8422a40e92d49d02b750b616810d95709a4493;p=thirdparty%2Fknot-resolver.git

modules/sd_watchdog nitpick: detect more errors
---

diff --git a/modules/sd_watchdog/sd_watchdog.c b/modules/sd_watchdog/sd_watchdog.c
index 0a2664ecd..959814467 100644
--- a/modules/sd_watchdog/sd_watchdog.c
+++ b/modules/sd_watchdog/sd_watchdog.c
@@ -36,7 +36,12 @@ int sd_watchdog_init(struct kr_module *module)
 	module->data = conf;
 
 	/* Check if watchdog is enabled */
-	conf->enabled = (bool)sd_watchdog_enabled(1, &conf->timeout_usec);
+	int ret = sd_watchdog_enabled(1, &conf->timeout_usec);
+	if (ret < 0) {
+		kr_log_error("[sd_watchdog] error: %s\n", strerror(abs(ret)));
+		return kr_error(ret);
+	}
+	conf->enabled = ret > 0;
 	if (!conf->enabled) {
 		kr_log_verbose("[sd_watchdog] disabled (not required)\n");
 		return kr_ok();
@@ -50,7 +55,7 @@ int sd_watchdog_init(struct kr_module *module)
 
 	uv_loop_t *loop = uv_default_loop();
 	uv_timer_init(loop, &conf->timer);
-	int ret = uv_timer_start(&conf->timer, keepalive_ping, delay_ms, delay_ms);
+	ret = uv_timer_start(&conf->timer, keepalive_ping, delay_ms, delay_ms);
 	if (ret != 0) {
 		kr_log_error("[sd_watchdog] error: failed to start uv_timer!\n");
 		return kr_error(ret);