From patchwork Mon Aug 13 19:48:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 177037 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 03D802C008D for ; Tue, 14 Aug 2012 05:51:04 +1000 (EST) Received: from localhost ([::1]:36028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10fG-0003aM-53 for incoming@patchwork.ozlabs.org; Mon, 13 Aug 2012 15:51:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10dl-0001XT-1K for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:49:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T10di-0003vL-UD for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:49:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T10di-0003v9-L7 for qemu-devel@nongnu.org; Mon, 13 Aug 2012 15:49:26 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7DJnQ3N001369 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Aug 2012 15:49:26 -0400 Received: from localhost (ovpn-113-98.phx2.redhat.com [10.3.113.98]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7DJnO1R025089; Mon, 13 Aug 2012 15:49:25 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Mon, 13 Aug 2012 16:48:55 -0300 Message-Id: <1344887349-13041-35-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.24 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 34/48] error, qerror: drop QDict member 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 Used to store error information, but it's unused now. Signed-off-by: Luiz Capitulino Reviewed-by: Markus Armbruster --- error.c | 4 ---- qerror.c | 4 ---- qerror.h | 1 - 3 files changed, 9 deletions(-) diff --git a/error.c b/error.c index 0e10373..1f05fc4 100644 --- a/error.c +++ b/error.c @@ -19,7 +19,6 @@ struct Error { - QDict *obj; char *msg; ErrorClass err_class; }; @@ -51,8 +50,6 @@ Error *error_copy(const Error *err) err_new = g_malloc0(sizeof(*err)); err_new->msg = g_strdup(err->msg); err_new->err_class = err->err_class; - err_new->obj = err->obj; - QINCREF(err_new->obj); return err_new; } @@ -75,7 +72,6 @@ const char *error_get_pretty(Error *err) void error_free(Error *err) { if (err) { - QDECREF(err->obj); g_free(err->msg); g_free(err); } diff --git a/qerror.c b/qerror.c index ccc52be..0818504 100644 --- a/qerror.c +++ b/qerror.c @@ -100,7 +100,6 @@ void qerror_report(ErrorClass eclass, const char *fmt, ...) /* Evil... */ struct Error { - QDict *obj; char *msg; ErrorClass err_class; }; @@ -111,8 +110,6 @@ void qerror_report_err(Error *err) qerr = qerror_new(); loc_save(&qerr->loc); - QINCREF(err->obj); - qerr->error = err->obj; qerr->err_msg = g_strdup(err->msg); qerr->err_class = err->err_class; @@ -154,7 +151,6 @@ static void qerror_destroy_obj(QObject *obj) assert(obj != NULL); qerr = qobject_to_qerror(obj); - QDECREF(qerr->error); g_free(qerr->err_msg); g_free(qerr); } diff --git a/qerror.h b/qerror.h index c5ad29f..d0a76a4 100644 --- a/qerror.h +++ b/qerror.h @@ -21,7 +21,6 @@ typedef struct QError { QObject_HEAD; - QDict *error; Location loc; char *err_msg; ErrorClass err_class;