From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwvhK-0004RP-RB for qemu-devel@nongnu.org; Thu, 02 Aug 2012 09:44:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwvhE-0007Vo-Lw for qemu-devel@nongnu.org; Thu, 02 Aug 2012 09:44:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwvhE-0007Vj-Dy for qemu-devel@nongnu.org; Thu, 02 Aug 2012 09:44:12 -0400 Date: Thu, 2 Aug 2012 10:44:45 -0300 From: Luiz Capitulino Message-ID: <20120802104445.7108144f@doriath.home> In-Reply-To: <87vch1r0z5.fsf@blackfin.pond.sub.org> References: <1343869374-23417-1-git-send-email-lcapitulino@redhat.com> <1343869374-23417-7-git-send-email-lcapitulino@redhat.com> <87vch1r0z5.fsf@blackfin.pond.sub.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 06/34] qerror: avoid passing qerr pointer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, pbonzini@redhat.com, eblake@redhat.com On Thu, 02 Aug 2012 13:23:58 +0200 Markus Armbruster wrote: > Luiz Capitulino writes: > > > Helps dropping/modifying qerror functions. > > > > Signed-off-by: Luiz Capitulino > > --- > > qerror.c | 24 ++++++++++++------------ > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/qerror.c b/qerror.c > > index 5efccec..59025ea 100644 > > --- a/qerror.c > > +++ b/qerror.c > > @@ -346,10 +346,10 @@ static QError *qerror_new(void) > > return qerr; > > } > > > > -static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, > > - const char *fmt, va_list *va) > > +static QDict *error_obj_from_fmt_no_fail(const char *fmt, va_list *va) > > Elsewhere, we use FOO_nofail() for a variant of FOO() that must not > fail. > > Call this function just error_obj_from_fmt()? > > Or if you think the name must convey it can't fail: > error_obj_from_fmt_nofail()? It's worth it, this function is dropped later on. > > > { > > QObject *obj; > > + QDict *ret; > > > > obj = qobject_from_jsonv(fmt, va); > > if (!obj) { > > @@ -361,9 +361,8 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, > > abort(); > > } > > > > - qerr->error = qobject_to_qdict(obj); > > - > > - obj = qdict_get(qerr->error, "class"); > > + ret = qobject_to_qdict(obj); > > + obj = qdict_get(ret, "class"); > > if (!obj) { > > fprintf(stderr, "missing 'class' key in '%s'\n", fmt); > > abort(); > > @@ -372,8 +371,8 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, > > fprintf(stderr, "'class' key value should be a string in '%s'\n", fmt); > > abort(); > > } > > - > > - obj = qdict_get(qerr->error, "data"); > > + > > + obj = qdict_get(ret, "data"); > > if (!obj) { > > fprintf(stderr, "missing 'data' key in '%s'\n", fmt); > > abort(); > > @@ -382,9 +381,11 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, > > fprintf(stderr, "'data' key value should be a dict in '%s'\n", fmt); > > abort(); > > } > > + > > + return ret; > > } > > > > -static void qerror_set_desc(QError *qerr, const char *fmt) > > +static const QErrorStringTable *get_desc_no_fail(const char *fmt) > > Likewise. > > > { > > int i; > > > > @@ -392,8 +393,7 @@ static void qerror_set_desc(QError *qerr, const char *fmt) > > > > for (i = 0; qerror_table[i].error_fmt; i++) { > > if (strcmp(qerror_table[i].error_fmt, fmt) == 0) { > > - qerr->entry = &qerror_table[i]; > > - return; > > + return &qerror_table[i]; > > } > > } > > > > @@ -426,8 +426,8 @@ static QError *qerror_from_info(const char *file, int linenr, const char *func, > > qerr->file = file; > > qerr->func = func; > > > > - qerror_set_data(qerr, fmt, va); > > - qerror_set_desc(qerr, fmt); > > + qerr->error = error_obj_from_fmt_no_fail(fmt, va); > > + qerr->entry = get_desc_no_fail(fmt); > > > > return qerr; > > } > > Turns side effects on qerr into a nice clean return values. Good! >