From patchwork Sun Oct 28 11:04:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 194693 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E2092C008D for ; Sun, 28 Oct 2012 22:41:20 +1100 (EST) Received: from localhost ([::1]:33416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSQgo-0003az-Un for incoming@patchwork.ozlabs.org; Sun, 28 Oct 2012 07:05:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSQgN-0002a0-2t for qemu-devel@nongnu.org; Sun, 28 Oct 2012 07:05:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSQgL-0007wj-OC for qemu-devel@nongnu.org; Sun, 28 Oct 2012 07:05:30 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:63527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSQgL-0007pH-Gj; Sun, 28 Oct 2012 07:05:29 -0400 Received: by mail-lb0-f173.google.com with SMTP id gj3so2423304lbb.4 for ; Sun, 28 Oct 2012 04:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=rxFela6sa3JMAOCLlJze7fA5XP+yMDCKc8GD+CT1KQQ=; b=wjehaP/9WtWpe10f0pbX4t2qHmgZ7S3bcJ1dfB812E8EiCPNXMCkt5Yc1QWei26PzB CcrpjZVtCBaM2GpMyBRm1xTdaYsYZYlDFa646bGPpN0fzEcySFrSdBQAqpDCyEh1O7JU ZLbsUy4INxKOBYMvN2Aiq37chGQcY4tNwDEGhAYj9UIjjQA7H49R0bQPIzaxuK6h4tE5 Hl0NHLVSoK7l6haUqLesuvAyymGqtG2dX8uTjkKE0MMhJUtJf3HjtxE10ehc1iOLR5Kf aq/NB14/p+c7GJIT7rNqqaEB3N+26sZ/LE/PdoQTXZD1RrNOH947mHNZdBBBq79BHU0f cCMw== Received: by 10.152.148.40 with SMTP id tp8mr24580814lab.30.1351422328956; Sun, 28 Oct 2012 04:05:28 -0700 (PDT) Received: from localhost.localdomain (blueswirl.broker.freenet6.net. [2001:5c0:1000:b::b867]) by mx.google.com with ESMTPS id ft3sm2070067lbb.1.2012.10.28.04.05.25 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 28 Oct 2012 04:05:28 -0700 (PDT) From: Blue Swirl To: qemu-devel@nongnu.org Date: Sun, 28 Oct 2012 11:04:48 +0000 Message-Id: <5ab69aafb781d87c79b9a390388e188c8f88dac1.1351422116.git.blauwirbel@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.217.173 Cc: qemu-trivial@nongnu.org, blauwirbel@gmail.com, Anthony Liguori Subject: [Qemu-devel] [PATCH v2 3/6] vnc: add missing static X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add missing 'static' qualifiers. Signed-off-by: Blue Swirl --- console.h | 2 -- ui/vnc-jobs.c | 10 +++++----- ui/vnc-jobs.h | 1 - ui/vnc.c | 14 +++++++------- ui/vnc.h | 5 ----- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/console.h b/console.h index 6099d8d..5ad3615 100644 --- a/console.h +++ b/console.h @@ -377,10 +377,8 @@ void cocoa_display_init(DisplayState *ds, int full_screen); /* vnc.c */ void vnc_display_init(DisplayState *ds); -void vnc_display_close(DisplayState *ds); void vnc_display_open(DisplayState *ds, const char *display, Error **errp); void vnc_display_add_client(DisplayState *ds, int csock, int skipauth); -int vnc_display_disable_login(DisplayState *ds); char *vnc_display_local_addr(DisplayState *ds); #ifdef CONFIG_VNC int vnc_display_password(DisplayState *ds, const char *password); diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index 3c592b3..dfe482d 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -320,6 +320,11 @@ static void *vnc_worker_thread(void *arg) return NULL; } +static bool vnc_worker_thread_running(void) +{ + return queue; /* Check global queue */ +} + void vnc_start_worker_thread(void) { VncJobQueue *q; @@ -332,11 +337,6 @@ void vnc_start_worker_thread(void) queue = q; /* Set global queue */ } -bool vnc_worker_thread_running(void) -{ - return queue; /* Check global queue */ -} - void vnc_stop_worker_thread(void) { if (!vnc_worker_thread_running()) diff --git a/ui/vnc-jobs.h b/ui/vnc-jobs.h index 86e6d88..31da103 100644 --- a/ui/vnc-jobs.h +++ b/ui/vnc-jobs.h @@ -40,7 +40,6 @@ void vnc_jobs_join(VncState *vs); void vnc_jobs_consume_buffer(VncState *vs); void vnc_start_worker_thread(void); -bool vnc_worker_thread_running(void); void vnc_stop_worker_thread(void); /* Locks */ diff --git a/ui/vnc.c b/ui/vnc.c index d0ffcc5..d95e6ef 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -479,12 +479,12 @@ void buffer_reserve(Buffer *buffer, size_t len) } } -int buffer_empty(Buffer *buffer) +static int buffer_empty(Buffer *buffer) { return buffer->offset == 0; } -uint8_t *buffer_end(Buffer *buffer) +static uint8_t *buffer_end(Buffer *buffer) { return buffer->buffer + buffer->offset; } @@ -1376,17 +1376,17 @@ void vnc_flush(VncState *vs) vnc_unlock_output(vs); } -uint8_t read_u8(uint8_t *data, size_t offset) +static uint8_t read_u8(uint8_t *data, size_t offset) { return data[offset]; } -uint16_t read_u16(uint8_t *data, size_t offset) +static uint16_t read_u16(uint8_t *data, size_t offset) { return ((data[offset] & 0xFF) << 8) | (data[offset + 1] & 0xFF); } -int32_t read_s32(uint8_t *data, size_t offset) +static int32_t read_s32(uint8_t *data, size_t offset) { return (int32_t)((data[offset] << 24) | (data[offset + 1] << 16) | (data[offset + 2] << 8) | data[offset + 3]); @@ -2763,7 +2763,7 @@ void vnc_display_init(DisplayState *ds) } -void vnc_display_close(DisplayState *ds) +static void vnc_display_close(DisplayState *ds) { VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; @@ -2785,7 +2785,7 @@ void vnc_display_close(DisplayState *ds) #endif } -int vnc_display_disable_login(DisplayState *ds) +static int vnc_display_disable_login(DisplayState *ds) { VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; diff --git a/ui/vnc.h b/ui/vnc.h index 068c2fc..c89f693 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -493,9 +493,6 @@ void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting); /* Buffer I/O functions */ -uint8_t read_u8(uint8_t *data, size_t offset); -uint16_t read_u16(uint8_t *data, size_t offset); -int32_t read_s32(uint8_t *data, size_t offset); uint32_t read_u32(uint8_t *data, size_t offset); /* Protocol stage functions */ @@ -507,8 +504,6 @@ void start_auth_vnc(VncState *vs); /* Buffer management */ void buffer_reserve(Buffer *buffer, size_t len); -int buffer_empty(Buffer *buffer); -uint8_t *buffer_end(Buffer *buffer); void buffer_reset(Buffer *buffer); void buffer_free(Buffer *buffer); void buffer_append(Buffer *buffer, const void *data, size_t len);