lkml.org 
[lkml]   [2015]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/44] kdbus: Cleanup tests in kdbus_cmd_send()
    Date
    Rearrange tests a little to make them look cleaner.

    Signed-off-by: Sergei Zviagintsev <sergei@s15v.net>
    ---
    ipc/kdbus/connection.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c
    index 93da7f539f74..a4d7414ecaea 100644
    --- a/ipc/kdbus/connection.c
    +++ b/ipc/kdbus/connection.c
    @@ -1977,7 +1977,7 @@ int kdbus_cmd_send(struct kdbus_conn *conn, struct file *f, void __user *argp)
    ret = kdbus_args_parse(&args, argp, &cmd);
    if (ret < 0)
    goto exit;
    - else if (ret > 0 && !cmd->msg_address) /* negotiation without msg */
    + if (ret > 0 && !cmd->msg_address) /* negotiation without msg */
    goto exit;

    ret2 = kdbus_args_parse_msg(&msg_args, KDBUS_PTR(cmd->msg_address),
    @@ -1985,10 +1985,11 @@ int kdbus_cmd_send(struct kdbus_conn *conn, struct file *f, void __user *argp)
    if (ret2 < 0) { /* cannot parse message */
    ret = ret2;
    goto exit;
    - } else if (ret2 > 0 && !ret) { /* msg-negot implies cmd-negot */
    - ret = -EINVAL;
    + }
    + if (ret > 0) /* negotiation */
    goto exit;
    - } else if (ret > 0) { /* negotiation */
    + if (ret2 > 0) { /* msg-negot implies cmd-negot */
    + ret = -EINVAL;
    goto exit;
    }

    --
    1.8.3.1


    \
     
     \ /
      Last update: 2015-10-08 14:01    [W:4.086 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site