Re: [PATCH v2 01/15] android: Remove not needed local variable in connect_hal

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Szymon,

On Fri, Oct 25, 2013 at 1:49 PM, Szymon Janc <szymon.janc@xxxxxxxxx> wrote:
> err variable was set but never read.
> ---
>  android/main.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/android/main.c b/android/main.c
> index 50b5901..18dc9f7 100644
> --- a/android/main.c
> +++ b/android/main.c
> @@ -239,12 +239,12 @@ static GIOChannel *connect_hal(GIOFunc connect_cb)
>         struct sockaddr_un addr;
>         GIOCondition cond;
>         GIOChannel *io;
> -       int err, sk;
> +       int sk;
>
>         sk = socket(PF_LOCAL, SOCK_SEQPACKET, 0);
>         if (sk < 0) {
> -               err = errno;
> -               error("Failed to create socket: %d (%s)", err, strerror(err));
> +               error("Failed to create socket: %d (%s)", errno,
> +                                                       strerror(errno));
>                 return NULL;
>         }
>
> @@ -258,9 +258,7 @@ static GIOChannel *connect_hal(GIOFunc connect_cb)
>
>         memcpy(addr.sun_path, BLUEZ_HAL_SK_PATH, sizeof(BLUEZ_HAL_SK_PATH));
>
> -       err = connect(sk, (struct sockaddr *) &addr, sizeof(addr));
> -       if (err < 0) {
> -               err = -errno;
> +       if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
>                 error("Failed to connect HAL socket: %d (%s)", errno,
>                                                         strerror(errno));
>                 g_io_channel_unref(io);
> --
> 1.8.4.1

Applied, thanks.


-- 
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux