[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/48] qerror: qerror_format(): return an allocated
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 08/48] qerror: qerror_format(): return an allocated string |
Date: |
Mon, 13 Aug 2012 16:48:29 -0300 |
Simplifies current and future users.
Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
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
--
1.7.11.2.249.g31c7954.dirty
- [Qemu-devel] [PULL 00/48]: QMP queue, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 01/48] monitor: drop unused monitor debug code, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 02/48] qerror: QERR_AMBIGUOUS_PATH: drop %(object) from human msg, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 03/48] qerror: QERR_DEVICE_ENCRYPTED: change error message, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 04/48] qerror: reduce public exposure, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 05/48] qerror: drop qerror_abort(), Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 06/48] qerror: avoid passing qerr pointer, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 08/48] qerror: qerror_format(): return an allocated string,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 07/48] qerror: QError: drop file, linenr, func, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 10/48] error: don't delay error message construction, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 11/48] qmp: query-block: add 'encryption_key_missing' field, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 09/48] qerror: don't delay error message construction, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 12/48] hmp: hmp_cont(): don't rely on QERR_DEVICE_ENCRYPTED, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 14/48] net: inet_connect(), inet_connect_opts(): add in_progress argument, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 13/48] hmp_change(): don't access DeviceEncrypted's data, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 16/48] qerror: drop QERR_SOCKET_CONNECT_IN_PROGRESS, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 15/48] migration: don't rely on any QERR_SOCKET_*, Luiz Capitulino, 2012/08/13
- [Qemu-devel] [PATCH 17/48] block: block_int: include qerror.h, Luiz Capitulino, 2012/08/13