X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus-req.c;h=5dcd470af661124169c86048639a08c256d862f1;hp=5180a6f828625a6ca476ff7cb837c414d7d27f23;hb=cd82f9758dd6da37fb11f2992ceb66d3ee99bac0;hpb=df088f03c02aebba304a371486f09e95ed34bf5f

diff --git a/libubus-req.c b/libubus-req.c
index 5180a6f..5dcd470 100644
--- a/libubus-req.c
+++ b/libubus-req.c
@@ -145,7 +145,6 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
 	int64_t timeout = 0, time_end = 0;
 
 	if (!registered) {
-		uloop_init();
 		ubus_add_uloop(ctx);
 	}
 
@@ -220,24 +219,9 @@ int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
 	return 0;
 }
 
-int ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
-                       struct blob_attr *msg, struct ubus_request *req)
-{
-	blob_buf_init(&b, 0);
-	blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
-	blob_put_string(&b, UBUS_ATTR_METHOD, method);
-	if (msg)
-		blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
-
-	if (ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj) < 0)
-		return UBUS_STATUS_INVALID_ARGUMENT;
-
-	return 0;
-}
-
-
-int ubus_invoke_async_fd(struct ubus_context *ctx, uint32_t obj, const char *method,
-                       struct blob_attr *msg, struct ubus_request *req, int fd)
+int ubus_invoke_async_fd(struct ubus_context *ctx, uint32_t obj,
+			 const char *method, struct blob_attr *msg,
+			 struct ubus_request *req, int fd)
 {
 	blob_buf_init(&b, 0);
 	blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
@@ -252,25 +236,9 @@ int ubus_invoke_async_fd(struct ubus_context *ctx, uint32_t obj, const char *met
 	return 0;
 }
 
-int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
-                struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
-		int timeout)
-{
-	struct ubus_request req;
-	int rc;
-
-	rc = ubus_invoke_async(ctx, obj, method, msg, &req);
-	if (rc)
-		return rc;
-
-	req.data_cb = cb;
-	req.priv = priv;
-	return ubus_complete_request(ctx, &req, timeout);
-}
-
 int ubus_invoke_fd(struct ubus_context *ctx, uint32_t obj, const char *method,
-                struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
-		int timeout, int fd)
+		   struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
+		   int timeout, int fd)
 {
 	struct ubus_request req;
 	int rc;