projects
/
project
/
ubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1579969
)
move ubus_start_request to libubus-req.c
author
Felix Fietkau
<nbd@openwrt.org>
Fri, 14 Dec 2012 18:48:26 +0000
(19:48 +0100)
committer
Felix Fietkau
<nbd@openwrt.org>
Fri, 14 Dec 2012 18:48:26 +0000
(19:48 +0100)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
libubus-req.c
patch
|
blob
|
history
libubus.c
patch
|
blob
|
history
diff --git
a/libubus-req.c
b/libubus-req.c
index
74286c0
..
88a5453
100644
(file)
--- a/
libubus-req.c
+++ b/
libubus-req.c
@@
-48,6
+48,22
@@
static void __ubus_process_req_data(struct ubus_request *req)
}
}
}
}
+int __hidden ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
+ struct blob_attr *msg, int cmd, uint32_t peer)
+{
+ memset(req, 0, sizeof(*req));
+
+ if (msg && blob_pad_len(msg) > UBUS_MAX_MSGLEN)
+ return -1;
+
+ INIT_LIST_HEAD(&req->list);
+ INIT_LIST_HEAD(&req->pending);
+ req->ctx = ctx;
+ req->peer = peer;
+ req->seq = ++ctx->request_seq;
+ return ubus_send_msg(ctx, req->seq, msg, cmd, peer);
+}
+
void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req)
{
if (!list_empty(&req->list))
void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req)
{
if (!list_empty(&req->list))
diff --git
a/libubus.c
b/libubus.c
index
933d300
..
fee3ee8
100644
(file)
--- a/
libubus.c
+++ b/
libubus.c
@@
-145,22
+145,6
@@
static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr
req->cb(ureq->ctx, &obj, ureq->priv);
}
req->cb(ureq->ctx, &obj, ureq->priv);
}
-int __hidden ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
- struct blob_attr *msg, int cmd, uint32_t peer)
-{
- memset(req, 0, sizeof(*req));
-
- if (msg && blob_pad_len(msg) > UBUS_MAX_MSGLEN)
- return -1;
-
- INIT_LIST_HEAD(&req->list);
- INIT_LIST_HEAD(&req->pending);
- req->ctx = ctx;
- req->peer = peer;
- req->seq = ++ctx->request_seq;
- return ubus_send_msg(ctx, req->seq, msg, cmd, peer);
-}
-
int ubus_lookup(struct ubus_context *ctx, const char *path,
ubus_lookup_handler_t cb, void *priv)
{
int ubus_lookup(struct ubus_context *ctx, const char *path,
ubus_lookup_handler_t cb, void *priv)
{