NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use a separate buffer for <sound> subelements

Browse Source 
Convert virDomainSoundDefFormat to use a separate buffer
for subelements.
This commit is contained in:
Ján Tomko 2017-06-27 16:27:18 +02:00
parent 0c1d863232
commit a0d43268ca
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/conf/domain_conf.c
View File

@ -23174,38 +23174,32 @@ virDomainSoundDefFormat(virBufferPtr buf,
unsigned int flags) unsigned int flags)
{ {
const char *model = virDomainSoundModelTypeToString(def->model); const char *model = virDomainSoundModelTypeToString(def->model);
bool children = false; virBuffer childBuf = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
virBufferAdjustIndent(&childBuf, virBufferGetIndent(buf, false) + 2);
if (!model) { if (!model) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected sound model %d"), def->model); _("unexpected sound model %d"), def->model);
return -1; return -1;
} }
for (i = 0; i < def->ncodecs; i++)
virDomainSoundCodecDefFormat(&childBuf, def->codecs[i]);
if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) {
virBufferFreeAndReset(&childBuf);
return -1;
}
if (virBufferCheckError(&childBuf) < 0)
return -1;
virBufferAsprintf(buf, "<sound model='%s'", model); virBufferAsprintf(buf, "<sound model='%s'", model);
if (virBufferUse(&childBuf)) {
for (i = 0; i < def->ncodecs; i++) { virBufferAddLit(buf, ">\n");
if (!children) { virBufferAddBuffer(buf, &childBuf);
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
children = true;
}
virDomainSoundCodecDefFormat(buf, def->codecs[i]);
}
if (virDomainDeviceInfoNeedsFormat(&def->info, flags)) {
if (!children) {
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
children = true;
}
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0)
return -1;
}
if (children) {
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</sound>\n"); virBufferAddLit(buf, "</sound>\n");
} else { } else {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");