| Message ID | 20180727151359.29061-24-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests: Compile-time format string checking for libqtest.h | expand |
On 07/27/2018 10:13 AM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> Might be worth adding mention of WHAT it is consistent with (as Thomas pointed out on 2/23, we still have inconsistencies with object_new_with_propv and such) > --- > tests/libqtest.c | 12 ++++++------ > tests/libqtest.h | 4 ++-- > 2 files changed, 8 insertions(+), 8 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On 07/27/2018 05:13 PM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > tests/libqtest.c | 12 ++++++------ > tests/libqtest.h | 4 ++-- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/tests/libqtest.c b/tests/libqtest.c > index a0d44793fa..3706f30aa2 100644 > --- a/tests/libqtest.c > +++ b/tests/libqtest.c > @@ -538,7 +538,7 @@ QDict *qmp_fdv(int fd, const char *fmt, va_list ap) > return qmp_fd_receive(fd); > } > > -QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap) > +QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap) Unless you also add something to our coding conventions which mandates the naming to be always this way, I think this is just unnecessary code churn. Thomas
Thomas Huth <thuth@redhat.com> writes: > On 07/27/2018 05:13 PM, Markus Armbruster wrote: >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> tests/libqtest.c | 12 ++++++------ >> tests/libqtest.h | 4 ++-- >> 2 files changed, 8 insertions(+), 8 deletions(-) >> >> diff --git a/tests/libqtest.c b/tests/libqtest.c >> index a0d44793fa..3706f30aa2 100644 >> --- a/tests/libqtest.c >> +++ b/tests/libqtest.c >> @@ -538,7 +538,7 @@ QDict *qmp_fdv(int fd, const char *fmt, va_list ap) >> return qmp_fd_receive(fd); >> } >> >> -QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap) >> +QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap) > > Unless you also add something to our coding conventions which mandates > the naming to be always this way, I think this is just unnecessary code > churn. Consistency isn't "necessary", but it helps. Tree-wide consistency would be nice, but my aim right now is local consistency in libqtest.h. Four out of its six functions taking va_list are sensibly named. This patch renames the remaining two. Well worth the diffstat, in my opinion.
diff --git a/tests/libqtest.c b/tests/libqtest.c index a0d44793fa..3706f30aa2 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -538,7 +538,7 @@ QDict *qmp_fdv(int fd, const char *fmt, va_list ap) return qmp_fd_receive(fd); } -QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap) +QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap) { qtest_qmp_vsend(s, fmt, ap); @@ -572,7 +572,7 @@ QDict *qtest_qmp(QTestState *s, const char *fmt, ...) QDict *response; va_start(ap, fmt); - response = qtest_qmpv(s, fmt, ap); + response = qtest_vqmp(s, fmt, ap); va_end(ap); return response; } @@ -608,7 +608,7 @@ void qtest_qmp_eventwait(QTestState *s, const char *event) qobject_unref(response); } -char *qtest_hmpv(QTestState *s, const char *fmt, va_list ap) +char *qtest_vhmp(QTestState *s, const char *fmt, va_list ap) { char *cmd; QDict *resp; @@ -637,7 +637,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) char *ret; va_start(ap, fmt); - ret = qtest_hmpv(s, fmt, ap); + ret = qtest_vhmp(s, fmt, ap); va_end(ap); return ret; } @@ -943,7 +943,7 @@ QDict *qmp(const char *fmt, ...) QDict *response; va_start(ap, fmt); - response = qtest_qmpv(global_qtest, fmt, ap); + response = qtest_vqmp(global_qtest, fmt, ap); va_end(ap); return response; } @@ -963,7 +963,7 @@ char *hmp(const char *fmt, ...) char *ret; va_start(ap, fmt); - ret = qtest_hmpv(global_qtest, fmt, ap); + ret = qtest_vhmp(global_qtest, fmt, ap); va_end(ap); return ret; } diff --git a/tests/libqtest.h b/tests/libqtest.h index 3848086928..7e60abc9fd 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -106,7 +106,7 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ...) * * Sends a QMP message to QEMU and returns the response. */ -QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap) +QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); /** @@ -189,7 +189,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3); * * Returns: the command's output. The caller should g_free() it. */ -char *qtest_hmpv(QTestState *s, const char *fmt, va_list ap) +char *qtest_vhmp(QTestState *s, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); /**
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- tests/libqtest.c | 12 ++++++------ tests/libqtest.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)