|
 |
6f8c14 |
From e13297f45b4c5868800b1d3fc359bfd0723fcc5f Mon Sep 17 00:00:00 2001
|
|
|
6f8c14 |
From: Klaus Wenninger <klaus.wenninger@aon.at>
|
|
|
6f8c14 |
Date: Mon, 17 Sep 2018 23:13:37 +0200
|
|
|
6f8c14 |
Subject: [PATCH] Refactor: sbd-common: separate assignment and comparison
|
|
|
6f8c14 |
|
|
|
6f8c14 |
---
|
|
|
6f8c14 |
src/sbd-common.c | 7 ++++---
|
|
|
6f8c14 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
6f8c14 |
|
|
|
6f8c14 |
diff --git a/src/sbd-common.c b/src/sbd-common.c
|
|
|
6f8c14 |
index fcb7a31..679f946 100644
|
|
|
6f8c14 |
--- a/src/sbd-common.c
|
|
|
6f8c14 |
+++ b/src/sbd-common.c
|
|
|
6f8c14 |
@@ -376,12 +376,13 @@ watchdog_populate_list(void)
|
|
|
6f8c14 |
snprintf(entry_name, sizeof(entry_name),
|
|
|
6f8c14 |
SYS_CHAR_DEV_DIR "/%d:%d/device/driver",
|
|
|
6f8c14 |
major(watchdogs[i]), minor(watchdogs[i]));
|
|
|
6f8c14 |
- if ((len = readlink(entry_name, buf, sizeof(buf) - 1)) > 0) {
|
|
|
6f8c14 |
+ len = readlink(entry_name, buf, sizeof(buf) - 1);
|
|
|
6f8c14 |
+ if (len > 0) {
|
|
|
6f8c14 |
buf[len] = '\0';
|
|
|
6f8c14 |
wdg->dev_driver = strdup(basename(buf));
|
|
|
6f8c14 |
} else if ((wdg->dev_ident) &&
|
|
|
6f8c14 |
- (strcmp(wdg->dev_ident,
|
|
|
6f8c14 |
- "Software Watchdog") == 0)) {
|
|
|
6f8c14 |
+ (strcmp(wdg->dev_ident,
|
|
|
6f8c14 |
+ "Software Watchdog") == 0)) {
|
|
|
6f8c14 |
wdg->dev_driver = strdup("softdog");
|
|
|
6f8c14 |
}
|
|
|
6f8c14 |
break;
|
|
|
6f8c14 |
--
|
|
|
6f8c14 |
1.8.3.1
|
|
|
6f8c14 |
|