From patchwork Fri Jun 10 09:58:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9169399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ACE6060573 for ; Fri, 10 Jun 2016 10:27:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D28226490 for ; Fri, 10 Jun 2016 10:27:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 924B12833F; Fri, 10 Jun 2016 10:27:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=2.0 tests=BAYES_00,FSL_HELO_HOME, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 489DE26490 for ; Fri, 10 Jun 2016 10:27:20 +0000 (UTC) Received: from localhost ([::1]:39569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBJep-0007jV-9M for patchwork-qemu-devel@patchwork.kernel.org; Fri, 10 Jun 2016 06:27:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBJDM-0000rk-33 for qemu-devel@nongnu.org; Fri, 10 Jun 2016 05:58:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBJDE-0007Jv-SU for qemu-devel@nongnu.org; Fri, 10 Jun 2016 05:58:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBJDE-0007J1-N2 for qemu-devel@nongnu.org; Fri, 10 Jun 2016 05:58:48 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5572371092 for ; Fri, 10 Jun 2016 09:58:46 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5A9wjAJ014538; Fri, 10 Jun 2016 05:58:45 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id A72D881D1B; Fri, 10 Jun 2016 11:58:44 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 10 Jun 2016 11:58:38 +0200 Message-Id: <1465552722-14567-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1465552722-14567-1-git-send-email-kraxel@redhat.com> References: <1465552722-14567-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 10 Jun 2016 09:58:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/5] vnc: drop unused depth arg for set_pixel_format X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Spotted by Coverity. Cc: Paolo Bonzini Signed-off-by: Gerd Hoffmann Message-id: 1465204725-31562-1-git-send-email-kraxel@redhat.com --- ui/vnc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index c862fdc..942cfb9 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2115,8 +2115,7 @@ static void send_color_map(VncState *vs) } } -static void set_pixel_format(VncState *vs, - int bits_per_pixel, int depth, +static void set_pixel_format(VncState *vs, 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 +2123,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 +2229,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),