Update checks of the return value from mh_sysconfig_set_configured() to
explicitly check for the enum mh_result values.
Signed-off-by: Russell Bryant <rbryant(a)redhat.com>
---
src/lib/sysconfig_linux.c | 4 ++--
src/tests/mh_api_sysconfig.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/sysconfig_linux.c b/src/lib/sysconfig_linux.c
index 32c08b2..1474962 100644
--- a/src/lib/sysconfig_linux.c
+++ b/src/lib/sysconfig_linux.c
@@ -128,7 +128,7 @@ action_cb(svc_action_t *action)
snprintf(buf, sizeof(buf), "FAILED\n%d", action->rc);
}
- if (mh_sysconfig_set_configured(action_data->key, buf) == FALSE) {
+ if (mh_sysconfig_set_configured(action_data->key, buf) != MH_RES_SUCCESS) {
mh_err("Unable to write to key file '%s'",
action_data->key);
}
@@ -286,7 +286,7 @@ return_failure:
action_data = NULL;
}
- if (mh_sysconfig_set_configured(key, "ERROR") == FALSE) {
+ if (mh_sysconfig_set_configured(key, "ERROR") != MH_RES_SUCCESS) {
mh_err("Unable to write to file.");
}
diff --git a/src/tests/mh_api_sysconfig.h b/src/tests/mh_api_sysconfig.h
index 5eb4fe7..a4f33c6 100644
--- a/src/tests/mh_api_sysconfig.h
+++ b/src/tests/mh_api_sysconfig.h
@@ -37,13 +37,13 @@ class MhApiSysconfigSuite : public CxxTest::TestSuite
mh_sysconfig_keys_dir_set("/tmp/matahari-sysconfig-keys/");
- TS_ASSERT((mh_sysconfig_set_configured(key, "OK")) == TRUE);
+ TS_ASSERT((mh_sysconfig_set_configured(key, "OK")) == MH_RES_SUCCESS);
TS_ASSERT(((key_res = mh_sysconfig_is_configured(key))) != NULL);
TS_ASSERT(!strcmp("OK", key_res));
free(key_res);
for (int i = 0; i < DIMOF(invalid_keys); i++) {
- TS_ASSERT((mh_sysconfig_set_configured(invalid_keys[i], "OK")) ==
FALSE);
+ TS_ASSERT((mh_sysconfig_set_configured(invalid_keys[i], "OK")) ==
MH_RES_INVALID_ARGS);
}
}
};
--
1.7.6.2
Show replies by date