summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2012-08-01 18:06:44 -0300
committerLuiz Capitulino <lcapitulino@redhat.com>2012-08-13 14:17:53 -0300
commit6d3f0dbb304d59759b2faf1e50db94d996f51f8a (patch)
tree281287688341094d00e2d0b26bb124b0d1ec0212
parent3647f5c161dddb5ec22c2d8e0ab27811959e3ada (diff)
downloadqemu-6d3f0dbb304d59759b2faf1e50db94d996f51f8a.tar.gz
error, qerror: drop QDict member
Used to store error information, but it's unused now. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--error.c4
-rw-r--r--qerror.c4
-rw-r--r--qerror.h1
3 files changed, 0 insertions, 9 deletions
diff --git a/error.c b/error.c
index 0e1037333c..1f05fc466e 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 ccc52be2a7..08185047b4 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 c5ad29fedd..d0a76a4f71 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;