peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-06 23:43:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: refactor core_post_hook()

Browse Source 
- Reduce complexity
 - Change type, simplify
 - Allow errors from initctl

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2025-02-14 13:50:47 +01:00
parent c5db34b491
commit d9f2f2c8f9
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/core.c
+6 -11
View File
@@ -56,7 +56,7 @@ int core_pre_hook(sr_session_ctx_t *session, uint32_t sub_id, const char *module
int core_post_hook(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
const char *xpath, sr_event_t event, unsigned request_id, void *priv)
{
static int num_changes = 0;
static size_t num_changes = 0;
switch (event) {
case SR_EV_CHANGE:
@@ -66,15 +66,10 @@ int core_post_hook(sr_session_ctx_t *session, uint32_t sub_id, const char *modul
num_changes = 0;
return SR_ERR_OK;
case SR_EV_DONE:
if (num_changes <= 0) {
ERROR("BUG in core_post_hook(): callback tracking out of sync");
abort();
}
if (--num_changes == 0)
break;
return SR_ERR_OK;
num_changes--;
if (num_changes > 0)
return SR_ERR_OK;
break;
default:
ERROR("core_post_hook() should not be called with event %s", ev2str(event));
return SR_ERR_SYS;
@@ -87,7 +82,7 @@ int core_post_hook(sr_session_ctx_t *session, uint32_t sub_id, const char *modul
if (systemf("runlevel >/dev/null 2>&1"))
return SR_ERR_OK;
if (systemf("initctl -nbq reload"))
if (systemf("initctl -b reload"))
return SR_ERR_SYS;
return SR_ERR_OK;