libqtest: Rename qtest_FOOv() to qtest_vFOO() for consistency
13 of 13 C99 library function pairs taking ... or a va_list parameter are called FOO() and vFOO(). In QEMU, we sometimes call the one taking a va_list FOOv() instead. Bad taste. libqtest.h uses both spellings. Normalize it to the standard spelling. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180806065344.7103-24-armbru@redhat.com>
This commit is contained in:
parent
88b988c895
commit
248eef02c5
|
@ -538,7 +538,7 @@ QDict *qmp_fdv(int fd, const char *fmt, va_list ap)
|
||||||
return qmp_fd_receive(fd);
|
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);
|
qtest_qmp_vsend(s, fmt, ap);
|
||||||
|
|
||||||
|
@ -572,7 +572,7 @@ QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
|
||||||
QDict *response;
|
QDict *response;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
response = qtest_qmpv(s, fmt, ap);
|
response = qtest_vqmp(s, fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
@ -608,7 +608,7 @@ void qtest_qmp_eventwait(QTestState *s, const char *event)
|
||||||
qobject_unref(response);
|
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;
|
char *cmd;
|
||||||
QDict *resp;
|
QDict *resp;
|
||||||
|
@ -637,7 +637,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...)
|
||||||
char *ret;
|
char *ret;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
ret = qtest_hmpv(s, fmt, ap);
|
ret = qtest_vhmp(s, fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -943,7 +943,7 @@ QDict *qmp(const char *fmt, ...)
|
||||||
QDict *response;
|
QDict *response;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
response = qtest_qmpv(global_qtest, fmt, ap);
|
response = qtest_vqmp(global_qtest, fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
@ -963,7 +963,7 @@ char *hmp(const char *fmt, ...)
|
||||||
char *ret;
|
char *ret;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
ret = qtest_hmpv(global_qtest, fmt, ap);
|
ret = qtest_vhmp(global_qtest, fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,7 +106,7 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ...)
|
||||||
*
|
*
|
||||||
* Sends a QMP message to QEMU and returns the response.
|
* 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);
|
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.
|
* 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);
|
GCC_FMT_ATTR(2, 0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue