External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: virbuffer: Remove @dynamic from virBufferGetIndent

Browse Source 
After the conversion of all callers that would pass true as @dynamic to
a different function we can remove the unused argument now.

Additionally modify the return type to 'size_t' as indentation can't be
negative and remove checks whether @buf is passed as it's caller's duty
to do so.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-10-24 12:51:24 +02:00
parent c7ccb159ef
commit 5e8551fbc0
6 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -28487,7 +28487,7 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
xmlIndentTreeOutput = 1;
xmlbuf = xmlBufferCreate();
if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata,
virBufferGetIndent(buf, false) / 2, 1) < 0) {
virBufferGetIndent(buf) / 2, 1) < 0) {
xmlBufferFree(xmlbuf);
xmlIndentTreeOutput = oldIndentTreeOutput;
goto error;

2
src/conf/network_conf.c
View File

@ -2458,7 +2458,7 @@ virNetworkDefFormatBuf(virBufferPtr buf,
xmlIndentTreeOutput = 1;
xmlbuf = xmlBufferCreate();
if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata,
virBufferGetIndent(buf, false) / 2, 1) < 0) {
virBufferGetIndent(buf) / 2, 1) < 0) {
xmlBufferFree(xmlbuf);
xmlIndentTreeOutput = oldIndentTreeOutput;
goto error;

12
src/util/virbuffer.c
View File

@ -102,18 +102,12 @@ virBufferSetIndent(virBufferPtr buf, int indent)
/**
* virBufferGetIndent:
* @buf: the buffer
* @dynamic: if false, return set value; if true, return 0 unless next
* append would be affected by auto-indent
*
* Return the current auto-indent value, or -1 if there has been an error.
* Return the current auto-indent setting of @buf.
*/
int
virBufferGetIndent(const virBuffer *buf, bool dynamic)
size_t
virBufferGetIndent(const virBuffer *buf)
{
if (!buf || buf->error)
return -1;
if (dynamic && buf->use && buf->content[buf->use - 1] != '\n')
return 0;
return buf->indent;
}

4
src/util/virbuffer.h
View File

@ -107,9 +107,9 @@ void virBufferSetIndent(virBufferPtr, int indent);
* child buffer.
*/
#define virBufferSetChildIndent(childBuf_, parentBuf_) \
virBufferSetIndent(childBuf_, virBufferGetIndent(parentBuf_, false) + 2)
virBufferSetIndent(childBuf_, virBufferGetIndent(parentBuf_) + 2)
int virBufferGetIndent(const virBuffer *buf, bool dynamic);
size_t virBufferGetIndent(const virBuffer *buf);
size_t virBufferGetEffectiveIndent(const virBuffer *buf);
void virBufferTrim(virBufferPtr buf, const char *trim, int len);

2
tests/testutilsqemuschema.c
View File

@ -430,7 +430,7 @@ testQEMUSchemaValidateAlternate(virJSONValuePtr obj,
virBufferAddLit(debug, "(\n");
virBufferAdjustIndent(debug, 3);
indent = virBufferGetIndent(debug, false);
indent = virBufferGetIndent(debug);
n = virJSONValueArraySize(members);
for (i = 0; i < n; i++) {

12
tests/virbuftest.c
View File

@ -18,7 +18,7 @@ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
char *result = NULL;
int ret = 0;
if (virBufferGetIndent(buf, false) != 0 ||
if (virBufferGetIndent(buf) != 0 ||
virBufferGetEffectiveIndent(buf) != 0) {
VIR_TEST_DEBUG("Wrong indentation");
ret = -1;
@ -28,28 +28,28 @@ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
VIR_TEST_DEBUG("Wrong content");
ret = -1;
}
if (virBufferGetIndent(buf, false) != 3 ||
if (virBufferGetIndent(buf) != 3 ||
virBufferGetEffectiveIndent(buf) != 3 ||
virBufferError(buf)) {
VIR_TEST_DEBUG("Wrong indentation");
ret = -1;
}
virBufferAdjustIndent(buf, -2);
if (virBufferGetIndent(buf, false) != 1 ||
if (virBufferGetIndent(buf) != 1 ||
virBufferGetEffectiveIndent(buf) != 1 ||
virBufferError(buf)) {
VIR_TEST_DEBUG("Wrong indentation");
ret = -1;
}
virBufferAdjustIndent(buf, -3);
if (virBufferGetIndent(buf, false) != 0 ||
if (virBufferGetIndent(buf) != 0 ||
virBufferGetEffectiveIndent(buf) != 0) {
VIR_TEST_DEBUG("Indentation level not truncated");
ret = -1;
}
virBufferAdjustIndent(buf, 3);
virBufferFreeAndReset(buf);
if (virBufferGetIndent(buf, false) != 0 ||
if (virBufferGetIndent(buf) != 0 ||
virBufferGetEffectiveIndent(buf) != 0 ||
virBufferError(buf)) {
VIR_TEST_DEBUG("Reset didn't clear indentation");
@ -65,7 +65,7 @@ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
VIR_TEST_DEBUG("Wrong content");
ret = -1;
}
if (virBufferGetIndent(buf, false) != 2 ||
if (virBufferGetIndent(buf) != 2 ||
virBufferGetEffectiveIndent(buf) != 0) {
VIR_TEST_DEBUG("Wrong indentation");
ret = -1;