From patchwork Mon Aug 13 19:48:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 177061 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 EAE322C0092 for ; Tue, 14 Aug 2012 06:21:13 +1000 (EST) Received: from localhost ([::1]:60148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10db-0001Is-5u for incoming@patchwork.ozlabs.org; Mon, 13 Aug 2012 15:49:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10d2-0008Sp-Bv for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:48:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T10d1-0003kQ-4V for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:48:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10d0-0003kM-QT for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:48:43 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7DJmgNX001097 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Aug 2012 15:48:42 -0400 Received: from localhost (ovpn-113-98.phx2.redhat.com [10.3.113.98]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7DJmf3b000675; Mon, 13 Aug 2012 15:48:41 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Mon, 13 Aug 2012 16:48:29 -0300 Message-Id: <1344887349-13041-9-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.25 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 08/48] qerror: qerror_format(): return an allocated string 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 Simplifies current and future users. Signed-off-by: Luiz Capitulino Reviewed-by: Markus Armbruster --- error.c | 5 +---- qerror.c | 10 ++++++++-- qerror.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/error.c b/error.c index 58f55a0..3a62592 100644 --- a/error.c +++ b/error.c @@ -65,10 +65,7 @@ bool error_is_set(Error **errp) const char *error_get_pretty(Error *err) { if (err->msg == NULL) { - QString *str; - str = qerror_format(err->fmt, err->obj); - err->msg = g_strdup(qstring_get_str(str)); - QDECREF(str); + err->msg = qerror_format(err->fmt, err->obj); } return err->msg; diff --git a/qerror.c b/qerror.c index 6f9f49c..d073ed7 100644 --- a/qerror.c +++ b/qerror.c @@ -493,9 +493,11 @@ static QString *qerror_format_desc(QDict *error, return qstring; } -QString *qerror_format(const char *fmt, QDict *error) +char *qerror_format(const char *fmt, QDict *error) { const QErrorStringTable *entry = NULL; + QString *qstr; + char *ret; int i; for (i = 0; qerror_table[i].error_fmt; i++) { @@ -505,7 +507,11 @@ QString *qerror_format(const char *fmt, QDict *error) } } - return qerror_format_desc(error, entry); + qstr = qerror_format_desc(error, entry); + ret = g_strdup(qstring_get_str(qstr)); + QDECREF(qstr); + + return ret; } /** diff --git a/qerror.h b/qerror.h index 3c0b14c..aec76b2 100644 --- a/qerror.h +++ b/qerror.h @@ -34,7 +34,7 @@ QString *qerror_human(const QError *qerror); void qerror_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void qerror_report_err(Error *err); void assert_no_error(Error *err); -QString *qerror_format(const char *fmt, QDict *error); +char *qerror_format(const char *fmt, QDict *error); /* * QError class list