From patchwork Mon Aug 13 19:48:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 177034 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 663582C0091 for ; Tue, 14 Aug 2012 05:49:08 +1000 (EST) Received: from localhost ([::1]:57911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10dO-0008UD-FD for incoming@patchwork.ozlabs.org; Mon, 13 Aug 2012 15:49:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10cw-0008B6-Rj for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:48:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T10cu-0003iR-LE for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:48:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10cu-0003iK-C9 for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:48:36 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7DJmZOJ023119 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Aug 2012 15:48:35 -0400 Received: from localhost (ovpn-113-98.phx2.redhat.com [10.3.113.98]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7DJmYpX016051; Mon, 13 Aug 2012 15:48:35 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Mon, 13 Aug 2012 16:48:25 -0300 Message-Id: <1344887349-13041-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1344887349-13041-1-git-send-email-lcapitulino@redhat.com> References: <1344887349-13041-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 04/48] qerror: reduce public exposure 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 qerror will be dropped in a near future, let's reduce its public exposure by making functions only used in qerror.c static. Signed-off-by: Luiz Capitulino Reviewed-by: Markus Armbruster --- qerror.c | 10 +++++----- qerror.h | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/qerror.c b/qerror.c index de0a79e..bfb875a 100644 --- a/qerror.c +++ b/qerror.c @@ -336,7 +336,7 @@ static const QErrorStringTable qerror_table[] = { * * Return strong reference. */ -QError *qerror_new(void) +static QError *qerror_new(void) { QError *qerr; @@ -424,8 +424,8 @@ static void qerror_set_desc(QError *qerr, const char *fmt) * * Return strong reference. */ -QError *qerror_from_info(const char *file, int linenr, const char *func, - const char *fmt, va_list *va) +static QError *qerror_from_info(const char *file, int linenr, const char *func, + const char *fmt, va_list *va) { QError *qerr; @@ -549,7 +549,7 @@ QString *qerror_human(const QError *qerror) * it uses error_report() for this, so that the output is routed to the right * place (ie. stderr or Monitor's device). */ -void qerror_print(QError *qerror) +static void qerror_print(QError *qerror) { QString *qstring = qerror_human(qerror); loc_push_restore(&qerror->loc); @@ -620,7 +620,7 @@ void assert_no_error(Error *err) /** * qobject_to_qerror(): Convert a QObject into a QError */ -QError *qobject_to_qerror(const QObject *obj) +static QError *qobject_to_qerror(const QObject *obj) { if (qobject_type(obj) != QTYPE_QERROR) { return NULL; diff --git a/qerror.h b/qerror.h index b4c8758..fe8870c 100644 --- a/qerror.h +++ b/qerror.h @@ -33,11 +33,7 @@ typedef struct QError { const QErrorStringTable *entry; } QError; -QError *qerror_new(void); -QError *qerror_from_info(const char *file, int linenr, const char *func, - const char *fmt, va_list *va) GCC_FMT_ATTR(4, 0); QString *qerror_human(const QError *qerror); -void qerror_print(QError *qerror); void qerror_report_internal(const char *file, int linenr, const char *func, const char *fmt, ...) GCC_FMT_ATTR(4, 5); void qerror_report_err(Error *err); @@ -45,7 +41,6 @@ void assert_no_error(Error *err); QString *qerror_format(const char *fmt, QDict *error); #define qerror_report(fmt, ...) \ qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) -QError *qobject_to_qerror(const QObject *obj); /* * QError class list