From 861f78f588bf3505d1913624667f96ae18122fb1 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Sat, 2 May 2020 17:08:54 +0200 Subject: [PATCH] fix state path kludge --- apps/backend/backend_plugin.c | 5 ++--- lib/src/clixon_proto_client.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c index 1d361473..4daca324 100644 --- a/apps/backend/backend_plugin.c +++ b/apps/backend/backend_plugin.c @@ -256,9 +256,8 @@ clixon_plugin_statedata_all(clicon_handle h, { char *kpath; if (xpath && - (kpath = clicon_option_str(h, "CLICON_STATE_PATH_KLUDGE")) != NULL){ - if (strncmp(xpath, kpath, strlen(kpath)) == 0) - ; + (kpath = clicon_option_str(h, "CLICON_STATE_PATH_KLUDGE")) != NULL && + strncmp(xpath, kpath, strlen(kpath)) == 0){ } else { #endif /* USE_STATE_PATH_KLUDGE */ diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c index 7713c87a..785e72e3 100644 --- a/lib/src/clixon_proto_client.c +++ b/lib/src/clixon_proto_client.c @@ -731,9 +731,8 @@ clicon_rpc_get(clicon_handle h, { char *kpath; if (xpath && - (kpath = clicon_option_str(h, "CLICON_STATE_PATH_KLUDGE")) != NULL){ - if (strncmp(xpath, kpath, strlen(kpath)) == 0) - ; + (kpath = clicon_option_str(h, "CLICON_STATE_PATH_KLUDGE")) != NULL && + strncmp(xpath, kpath, strlen(kpath)) == 0){ } else #endif /* USE_STATE_PATH_KLUDGE */