[PATCH] libosmocore[master]: Fix broken ctrl commands without lookups

[Max]

Review at  https://gerrit.osmocom.org/2461

Fix broken ctrl commands without lookups

Recent changes to libosmoctrl resulted in ctrl comands without lookup
function being broken. Fix this by making local lookup helpers mutually
exclusive with cmd's lookup helpers (lookup helper from cmd will have
higher priority).

Change-Id: Iddd20602047ebd9be1b668593f5dfa6f1d3e8369
---
M src/ctrl/control_if.c
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/2461/1

diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c
index c4b6f91..7d3edd2 100644
--- a/src/ctrl/control_if.c
+++ b/src/ctrl/control_if.c
@@ -234,15 +234,12 @@
 	}
 
 	for (i=0;i<vector_active(vline);i++) {
-		struct lookup_helper *lh;
 		int rc;
 
 		if (ctrl->lookup)
 			rc = ctrl->lookup(data, vline, &node, &cmd->node, &i);
-		else
-			rc = 0;
-
-		if (!rc) {
+		else {
+			struct lookup_helper *lh;
 			llist_for_each_entry(lh, &ctrl_lookup_helpers, list) {
 				rc = lh->lookup(data, vline, &node, &cmd->node, &i);
 				if (rc)

-- 
To view, visit https://gerrit.osmocom.org/2461
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddd20602047ebd9be1b668593f5dfa6f1d3e8369
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>