[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 34/35] error, qerror: drop QDict member
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 34/35] error, qerror: drop QDict member |
Date: |
Tue, 7 Aug 2012 12:53:45 -0300 |
Used to store error information, but it's unused now.
Signed-off-by: Luiz Capitulino <address@hidden>
---
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;
--
1.7.11.2.249.g31c7954.dirty
- [Qemu-devel] [PATCH 03/35] qerror: QERR_DEVICE_ENCRYPTED: change error message, (continued)
- [Qemu-devel] [PATCH 03/35] qerror: QERR_DEVICE_ENCRYPTED: change error message, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 24/35] error, qerror: add ErrorClass argument to error functions, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 35/35] docs: writing-qmp-commands.txt: update error section, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 33/35] qerror: drop qerror_table and qerror_format(), Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 31/35] error: drop error_get_qobject()/error_set_qobject(), Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 11/35] qmp: query-block: add 'valid_encryption_key' field, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 16/35] qerror: drop QERR_SOCKET_CONNECT_IN_PROGRESS, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 18/35] hmp: hmp.h: include qdict.h, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 34/35] error, qerror: drop QDict member,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 23/35] qerror: qerror_table: don't use C99 struct initializers, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 21/35] qapi: don't convert enum strings to lowercase, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 25/35] qerror: add proper ErrorClass value for QERR_ macros, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 28/35] error: drop unused functions, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 29/35] qmp: switch to the new error format on the wire, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 06/35] qerror: avoid passing qerr pointer, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 04/35] qerror: reduce public exposure, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 14/35] net: inet_connect(), inet_connect_opts(): add in_progress argument, Luiz Capitulino, 2012/08/07