file: properly use container_of() to not trip type safety warnings
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 16 Apr 2013 19:21:25 +0000 (21:21 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 16 Apr 2013 19:21:25 +0000 (21:21 +0200)
file.c

diff --git a/file.c b/file.c
index ddbd61b8a114575677d8b236af674066341c4cac..b0bdd99397f42107dc7a72b928875a008ed1519f 100644 (file)
--- a/file.c
+++ b/file.c
@@ -381,7 +381,7 @@ static void
 rpc_file_exec_opipe_read_cb(struct ustream *s, int bytes)
 {
        struct rpc_file_exec_context *c =
-               container_of(s, struct rpc_file_exec_context, opipe);
+               container_of(s, struct rpc_file_exec_context, opipe.stream);
 
        if (ustream_read_buf_full(s))
                rpc_file_exec_reply(c, UBUS_STATUS_NOT_SUPPORTED);
@@ -391,7 +391,7 @@ static void
 rpc_file_exec_epipe_read_cb(struct ustream *s, int bytes)
 {
        struct rpc_file_exec_context *c =
-               container_of(s, struct rpc_file_exec_context, epipe);
+               container_of(s, struct rpc_file_exec_context, epipe.stream);
 
        if (ustream_read_buf_full(s))
                rpc_file_exec_reply(c, UBUS_STATUS_NOT_SUPPORTED);
@@ -401,7 +401,7 @@ static void
 rpc_file_exec_opipe_state_cb(struct ustream *s)
 {
        struct rpc_file_exec_context *c =
-               container_of(s, struct rpc_file_exec_context, opipe);
+               container_of(s, struct rpc_file_exec_context, opipe.stream);
 
        if (c->opipe.stream.eof && c->epipe.stream.eof)
                rpc_file_exec_reply(c, UBUS_STATUS_OK);
@@ -411,7 +411,7 @@ static void
 rpc_file_exec_epipe_state_cb(struct ustream *s)
 {
        struct rpc_file_exec_context *c =
-               container_of(s, struct rpc_file_exec_context, epipe);
+               container_of(s, struct rpc_file_exec_context, epipe.stream);
 
        if (c->opipe.stream.eof && c->epipe.stream.eof)
                rpc_file_exec_reply(c, UBUS_STATUS_OK);