From patchwork Mon Jun 7 06:08:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 54831 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 2A194B7D5E for ; Mon, 7 Jun 2010 16:09:52 +1000 (EST) Received: from localhost ([127.0.0.1]:37243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLVWu-0003Mb-6O for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2010 02:09:48 -0400 Received: from [140.186.70.92] (port=34397 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLVV0-0003Le-4U for qemu-devel@nongnu.org; Mon, 07 Jun 2010 02:07:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OLVUx-0002fv-EW for qemu-devel@nongnu.org; Mon, 07 Jun 2010 02:07:49 -0400 Received: from iksaif.net ([88.191.73.63]:54690) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OLVUx-0002fP-5r for qemu-devel@nongnu.org; Mon, 07 Jun 2010 02:07:47 -0400 Received: from tartiflon (lal69-3-82-241-209-44.fbx.proxad.net [82.241.209.44]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 0C49FC90076; Mon, 7 Jun 2010 08:11:56 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Mon, 7 Jun 2010 08:08:08 +0200 Message-Id: <1275890889-13349-6-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1275890889-13349-1-git-send-email-corentincj@iksaif.net> References: <1275890889-13349-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 v2 5/6] vnc: rename vnc-encoding-* vnc-enc-* 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 For the same reason that we don't use vnc-authentication-sasl.c but vnc-auth-sals.c. Because it's tooooo long. Signed-off-by: Corentin Chary --- Makefile.objs | 4 ++-- ui/{vnchextile.h => vnc-enc-hextile-template.h} | 0 ui/{vnc-encoding-hextile.c => vnc-enc-hextile.c} | 12 ++++++------ ui/{vnc-encoding-tight.c => vnc-enc-tight.c} | 2 +- ui/{vnc-encoding-tight.h => vnc-enc-tight.h} | 0 ui/{vnc-encoding-zlib.c => vnc-enc-zlib.c} | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename ui/{vnchextile.h => vnc-enc-hextile-template.h} (100%) rename ui/{vnc-encoding-hextile.c => vnc-enc-hextile.c} (93%) rename ui/{vnc-encoding-tight.c => vnc-enc-tight.c} (99%) rename ui/{vnc-encoding-tight.h => vnc-enc-tight.h} (100%) rename ui/{vnc-encoding-zlib.c => vnc-enc-zlib.c} (100%) diff --git a/ui/vnc-encoding-tight.h b/ui/vnc-enc-tight.h similarity index 100% rename from ui/vnc-encoding-tight.h rename to ui/vnc-enc-tight.h diff --git a/ui/vnc-encoding-zlib.c b/ui/vnc-enc-zlib.c similarity index 100% rename from ui/vnc-encoding-zlib.c rename to ui/vnc-enc-zlib.c diff --git a/Makefile.objs b/Makefile.objs index d5973ba..22622a9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -104,8 +104,8 @@ ui-obj-y += keymaps.o ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o ui-obj-$(CONFIG_CURSES) += curses.o ui-obj-y += vnc.o d3des.o -ui-obj-y += vnc-encoding-zlib.o vnc-encoding-hextile.o -ui-obj-y += vnc-encoding-tight.o +ui-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o +ui-obj-y += vnc-enc-tight.o ui-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o ui-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o ui-obj-$(CONFIG_COCOA) += cocoa.o diff --git a/ui/vnchextile.h b/ui/vnc-enc-hextile-template.h similarity index 100% rename from ui/vnchextile.h rename to ui/vnc-enc-hextile-template.h diff --git a/ui/vnc-encoding-hextile.c b/ui/vnc-enc-hextile.c similarity index 93% rename from ui/vnc-encoding-hextile.c rename to ui/vnc-enc-hextile.c index 728f25e..fa4b264 100644 --- a/ui/vnc-encoding-hextile.c +++ b/ui/vnc-enc-hextile.c @@ -33,32 +33,32 @@ static void hextile_enc_cord(uint8_t *ptr, int x, int y, int w, int h) } #define BPP 8 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define BPP 16 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define BPP 32 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define GENERIC #define BPP 8 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC #define GENERIC #define BPP 16 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC #define GENERIC #define BPP 32 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC diff --git a/ui/vnc-encoding-tight.c b/ui/vnc-enc-tight.c similarity index 99% rename from ui/vnc-encoding-tight.c rename to ui/vnc-enc-tight.c index 4257bd0..6db5570 100644 --- a/ui/vnc-encoding-tight.c +++ b/ui/vnc-enc-tight.c @@ -39,7 +39,7 @@ #include "qdict.h" #include "qint.h" #include "vnc.h" -#include "vnc-encoding-tight.h" +#include "vnc-enc-tight.h" /* Compression level stuff. The following array contains various encoder parameters for each of 10 compression levels (0..9).