From 1643f728e7c99362d1925d6085a376f18cf46b5e Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 7 Feb 2011 02:40:40 +0100
Subject: [PATCH] make ubusd_get_client_by_id static

---
 ubusd.c       | 13 +------------
 ubusd.h       |  3 +--
 ubusd_proto.c | 11 +++++++++++
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ubusd.c b/ubusd.c
index 14eb537..a283f59 100644
--- a/ubusd.c
+++ b/ubusd.c
@@ -12,7 +12,7 @@
 
 #include "ubusd.h"
 
-static struct avl_tree clients;
+struct avl_tree clients;
 
 static struct ubus_msg_buf *ubus_msg_unshare(struct ubus_msg_buf *ub)
 {
@@ -249,17 +249,6 @@ disconnect:
 	handle_client_disconnect(cl);
 }
 
-struct ubus_client *ubusd_get_client_by_id(uint32_t id)
-{
-	struct ubus_id *clid;
-
-	clid = ubus_find_id(&clients, id);
-	if (!clid)
-		return NULL;
-
-	return container_of(clid, struct ubus_client, id);
-}
-
 static bool get_next_connection(int fd)
 {
 	struct ubus_client *cl;
diff --git a/ubusd.h b/ubusd.h
index 87cc831..4959a91 100644
--- a/ubusd.h
+++ b/ubusd.h
@@ -13,6 +13,7 @@
 #define UBUS_OBJ_HASH_BITS	4
 
 extern struct blob_buf b;
+extern struct avl_tree clients;
 
 struct ubus_msg_buf {
 	uint32_t refcount; /* ~0: uses external data buffer */
@@ -48,8 +49,6 @@ void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free);
 struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub);
 void ubus_msg_free(struct ubus_msg_buf *ub);
 
-struct ubus_client *ubusd_get_client_by_id(uint32_t id);
-
 void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub);
 bool ubusd_send_hello(struct ubus_client *cl);
 
diff --git a/ubusd_proto.c b/ubusd_proto.c
index 1a67501..57f9a28 100644
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -231,6 +231,17 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
 	return -1;
 }
 
+static struct ubus_client *ubusd_get_client_by_id(uint32_t id)
+{
+	struct ubus_id *clid;
+
+	clid = ubus_find_id(&clients, id);
+	if (!clid)
+		return NULL;
+
+	return container_of(clid, struct ubus_client, id);
+}
+
 static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
 	struct ubus_object *obj;