[1/1] vnc: remove unused depth argument in set_pixel_format
diff mbox

Message ID 1465206690-4721-1-git-send-email-den@openvz.org
State New
Headers show

Commit Message

Denis V. Lunev June 6, 2016, 9:51 a.m. UTC
Spotted by coverity, reported by Paolo.

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/vnc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Denis V. Lunev June 15, 2016, 3:07 p.m. UTC | #1
On 06/06/2016 12:51 PM, Denis V. Lunev wrote:
> Spotted by coverity, reported by Paolo.
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Paolo Bonzini <pbonzini@redhat.com>
> CC: Gerd Hoffmann <kraxel@redhat.com>
> ---
>   ui/vnc.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index c862fdc..cc94024 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2116,7 +2116,7 @@ static void send_color_map(VncState *vs)
>   }
>   
>   static void set_pixel_format(VncState *vs,
> -                             int bits_per_pixel, int depth,
> +                             int bits_per_pixel,
>                                int big_endian_flag, int true_color_flag,
>                                int red_max, int green_max, int blue_max,
>                                int red_shift, int green_shift, int blue_shift)
> @@ -2124,7 +2124,6 @@ static void set_pixel_format(VncState *vs,
>       if (!true_color_flag) {
>           /* Expose a reasonable default 256 color map */
>           bits_per_pixel = 8;
> -        depth = 8;
>           red_max = 7;
>           green_max = 7;
>           blue_max = 3;
> @@ -2231,7 +2230,7 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)
>           if (len == 1)
>               return 20;
>   
> -        set_pixel_format(vs, read_u8(data, 4), read_u8(data, 5),
> +        set_pixel_format(vs, read_u8(data, 4),
>                            read_u8(data, 6), read_u8(data, 7),
>                            read_u16(data, 8), read_u16(data, 10),
>                            read_u16(data, 12), read_u8(data, 14),
ping
Paolo Bonzini June 15, 2016, 3:10 p.m. UTC | #2
On 15/06/2016 17:07, Denis V. Lunev wrote:
> On 06/06/2016 12:51 PM, Denis V. Lunev wrote:
>> Spotted by coverity, reported by Paolo.
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> CC: Paolo Bonzini <pbonzini@redhat.com>
>> CC: Gerd Hoffmann <kraxel@redhat.com>

Looks like you and Gerd crossed:

commit ec9fb41a9fad0c7e05b656ae55481a6bd28cab2f
Author: Gerd Hoffmann <kraxel@redhat.com>
Date:   Mon Jun 6 11:18:45 2016 +0200

    vnc: drop unused depth arg for set_pixel_format

    Spotted by Coverity.

    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Message-id: 1465204725-31562-1-git-send-email-kraxel@redhat.com

Paolo

>> ---
>>   ui/vnc.c | 5 ++---
>>   1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/ui/vnc.c b/ui/vnc.c
>> index c862fdc..cc94024 100644
>> --- a/ui/vnc.c
>> +++ b/ui/vnc.c
>> @@ -2116,7 +2116,7 @@ static void send_color_map(VncState *vs)
>>   }
>>     static void set_pixel_format(VncState *vs,
>> -                             int bits_per_pixel, int depth,
>> +                             int bits_per_pixel,
>>                                int big_endian_flag, int true_color_flag,
>>                                int red_max, int green_max, int blue_max,
>>                                int red_shift, int green_shift, int
>> blue_shift)
>> @@ -2124,7 +2124,6 @@ static void set_pixel_format(VncState *vs,
>>       if (!true_color_flag) {
>>           /* Expose a reasonable default 256 color map */
>>           bits_per_pixel = 8;
>> -        depth = 8;
>>           red_max = 7;
>>           green_max = 7;
>>           blue_max = 3;
>> @@ -2231,7 +2230,7 @@ static int protocol_client_msg(VncState *vs,
>> uint8_t *data, size_t len)
>>           if (len == 1)
>>               return 20;
>>   -        set_pixel_format(vs, read_u8(data, 4), read_u8(data, 5),
>> +        set_pixel_format(vs, read_u8(data, 4),
>>                            read_u8(data, 6), read_u8(data, 7),
>>                            read_u16(data, 8), read_u16(data, 10),
>>                            read_u16(data, 12), read_u8(data, 14),
> ping
Denis V. Lunev June 15, 2016, 3:11 p.m. UTC | #3
On 06/15/2016 06:10 PM, Paolo Bonzini wrote:
>
> On 15/06/2016 17:07, Denis V. Lunev wrote:
>> On 06/06/2016 12:51 PM, Denis V. Lunev wrote:
>>> Spotted by coverity, reported by Paolo.
>>>
>>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>>> CC: Paolo Bonzini <pbonzini@redhat.com>
>>> CC: Gerd Hoffmann <kraxel@redhat.com>
> Looks like you and Gerd crossed:
>
> commit ec9fb41a9fad0c7e05b656ae55481a6bd28cab2f
> Author: Gerd Hoffmann <kraxel@redhat.com>
> Date:   Mon Jun 6 11:18:45 2016 +0200
>
>      vnc: drop unused depth arg for set_pixel_format
>
>      Spotted by Coverity.
>
>      Cc: Paolo Bonzini <pbonzini@redhat.com>
>      Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>      Message-id: 1465204725-31562-1-git-send-email-kraxel@redhat.com
>
> Paolo
>
ah, no problem. That is good. Thanks.

Patch
diff mbox

diff --git a/ui/vnc.c b/ui/vnc.c
index c862fdc..cc94024 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2116,7 +2116,7 @@  static void send_color_map(VncState *vs)
 }
 
 static void set_pixel_format(VncState *vs,
-                             int bits_per_pixel, int depth,
+                             int bits_per_pixel,
                              int big_endian_flag, int true_color_flag,
                              int red_max, int green_max, int blue_max,
                              int red_shift, int green_shift, int blue_shift)
@@ -2124,7 +2124,6 @@  static void set_pixel_format(VncState *vs,
     if (!true_color_flag) {
         /* Expose a reasonable default 256 color map */
         bits_per_pixel = 8;
-        depth = 8;
         red_max = 7;
         green_max = 7;
         blue_max = 3;
@@ -2231,7 +2230,7 @@  static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)
         if (len == 1)
             return 20;
 
-        set_pixel_format(vs, read_u8(data, 4), read_u8(data, 5),
+        set_pixel_format(vs, read_u8(data, 4),
                          read_u8(data, 6), read_u8(data, 7),
                          read_u16(data, 8), read_u16(data, 10),
                          read_u16(data, 12), read_u8(data, 14),