From patchwork Tue May 18 07:31:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 52854 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 916A4B7D69 for ; Tue, 18 May 2010 18:47:59 +1000 (EST) Received: from localhost ([127.0.0.1]:58540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEISx-0007fu-Gv for incoming@patchwork.ozlabs.org; Tue, 18 May 2010 04:47:55 -0400 Received: from [140.186.70.92] (port=44130 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEHnA-0001uj-O5 for qemu-devel@nongnu.org; Tue, 18 May 2010 04:06:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEHDS-0007xO-FR for qemu-devel@nongnu.org; Tue, 18 May 2010 03:30:45 -0400 Received: from iksaif.net ([88.191.73.63]:38552) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEHDP-0007vO-CO for qemu-devel@nongnu.org; Tue, 18 May 2010 03:27:49 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 6C51EC9001A; Tue, 18 May 2010 09:31:22 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Tue, 18 May 2010 09:31:12 +0200 Message-Id: <1274167881-6966-2-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1274167881-6966-1-git-send-email-corentincj@iksaif.net> References: <1274167881-6966-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Adam Litke Subject: [Qemu-devel] [PATCH 01/10] vnc: refactor set_encodings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Corentin Chary --- vnc.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/vnc.c b/vnc.c index 1f7ad73..a91c3a3 100644 --- a/vnc.c +++ b/vnc.c @@ -1587,6 +1587,13 @@ static void send_ext_audio_ack(VncState *vs) vnc_flush(vs); } +static void set_encoding(VncState *vs, int encoding) +{ + if (vs->vnc_encoding == -1) { + vs->vnc_encoding = encoding; + } +} + static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) { int i; @@ -1603,24 +1610,18 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) enc = encodings[i]; switch (enc) { case VNC_ENCODING_RAW: - if (vs->vnc_encoding != -1) { - vs->vnc_encoding = enc; - } + set_encoding(vs, enc); break; case VNC_ENCODING_COPYRECT: vs->features |= VNC_FEATURE_COPYRECT_MASK; break; case VNC_ENCODING_HEXTILE: vs->features |= VNC_FEATURE_HEXTILE_MASK; - if (vs->vnc_encoding != -1) { - vs->vnc_encoding = enc; - } + set_encoding(vs, enc); break; case VNC_ENCODING_ZLIB: vs->features |= VNC_FEATURE_ZLIB_MASK; - if (vs->vnc_encoding != -1) { - vs->vnc_encoding = enc; - } + set_encoding(vs, enc); break; case VNC_ENCODING_DESKTOPRESIZE: vs->features |= VNC_FEATURE_RESIZE_MASK;