From 68d63c6b6f8c10f4bde85f7327ce4bbbda24a725 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Thu, 6 Mar 2014 16:58:56 +0200 Subject: [PATCH] conf: eliminate hardcoded indentation in all remaining xml These last files had such a small change count I just put them into a single patch. --- src/conf/cpu_conf.c | 11 ++++++----- src/conf/netdev_bandwidth_conf.c | 6 ++++-- src/conf/netdev_vlan_conf.c | 6 ++++-- src/conf/netdev_vport_profile_conf.c | 6 ++++-- src/conf/secret_conf.c | 20 ++++++++++++-------- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 3d015f2224..4b982c96c8 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -1,7 +1,7 @@ /* * cpu_conf.c: CPU XML handling * - * Copyright (C) 2009-2013 Red Hat, Inc. + * Copyright (C) 2009-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -541,12 +541,11 @@ virCPUDefFormatBufFull(virBufferPtr buf, } } virBufferAddLit(buf, ">\n"); + virBufferAdjustIndent(buf, 2); if (def->arch) - virBufferAsprintf(buf, " %s\n", + virBufferAsprintf(buf, "%s\n", virArchToString(def->arch)); - - virBufferAdjustIndent(buf, 2); if (virCPUDefFormatBuf(buf, def, flags) < 0) return -1; virBufferAdjustIndent(buf, -2); @@ -645,12 +644,14 @@ virCPUDefFormatBuf(virBufferPtr buf, if (def->ncells) { virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); for (i = 0; i < def->ncells; i++) { - virBufferAddLit(buf, " cells[i].cpustr); virBufferAsprintf(buf, " memory='%d'", def->cells[i].mem); virBufferAddLit(buf, "/>\n"); } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); } return 0; diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index da1490930f..ed02704501 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 Red Hat, Inc. + * Copyright (C) 2009-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -214,7 +214,7 @@ virNetDevBandwidthRateFormat(virNetDevBandwidthRatePtr def, return 0; if (def->average || def->floor) { - virBufferAsprintf(buf, " <%s", elem_name); + virBufferAsprintf(buf, "<%s", elem_name); if (def->average) virBufferAsprintf(buf, " average='%llu'", def->average); @@ -257,9 +257,11 @@ virNetDevBandwidthFormat(virNetDevBandwidthPtr def, virBufferPtr buf) } virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); if (virNetDevBandwidthRateFormat(def->in, buf, "inbound") < 0 || virNetDevBandwidthRateFormat(def->out, buf, "outbound") < 0) goto cleanup; + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); ret = 0; diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index dbe203e8f9..e5196d5d7d 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -154,6 +154,7 @@ virNetDevVlanFormat(const virNetDevVlan *def, virBufferPtr buf) } virBufferAsprintf(buf, "\n", def->trunk ? " trunk='yes'" : ""); + virBufferAdjustIndent(buf, 2); for (i = 0; i < def->nTags; i++) { if (def->nativeMode != VIR_NATIVE_VLAN_MODE_DEFAULT && def->nativeTag == def->tag[i]) { @@ -163,12 +164,13 @@ virNetDevVlanFormat(const virNetDevVlan *def, virBufferPtr buf) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Bad value for nativeMode")); } - virBufferAsprintf(buf, " \n", + virBufferAsprintf(buf, "\n", def->tag[i], mode); } else { - virBufferAsprintf(buf, " \n", def->tag[i]); + virBufferAsprintf(buf, "\n", def->tag[i]); } } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); return 0; } diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index 8d403c40f3..c7d2ab1a74 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 Red Hat, Inc. + * Copyright (C) 2009-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -232,7 +232,8 @@ virNetDevVPortProfileFormat(virNetDevVPortProfilePtr virtPort, virNetDevVPortTypeToString(type)); } } - virBufferAddLit(buf, " managerID_specified && (type == VIR_NETDEV_VPORT_PROFILE_8021QBG || @@ -274,6 +275,7 @@ virNetDevVPortProfileFormat(virNetDevVPortProfilePtr virtPort, } virBufferAddLit(buf, "/>\n"); + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); return 0; } diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index c3252d1235..6fdefd0326 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -1,7 +1,7 @@ /* * secret_conf.c: internal XML handling * - * Copyright (C) 2009, 2011, 2013 Red Hat, Inc. + * Copyright (C) 2009, 2011, 2013, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -254,27 +254,28 @@ virSecretDefFormatUsage(virBufferPtr buf, def->usage_type); return -1; } - virBufferAsprintf(buf, " \n", type); + virBufferAsprintf(buf, "\n", type); + virBufferAdjustIndent(buf, 2); switch (def->usage_type) { case VIR_SECRET_USAGE_TYPE_NONE: break; case VIR_SECRET_USAGE_TYPE_VOLUME: if (def->usage.volume != NULL) - virBufferEscapeString(buf, " %s\n", + virBufferEscapeString(buf, "%s\n", def->usage.volume); break; case VIR_SECRET_USAGE_TYPE_CEPH: if (def->usage.ceph != NULL) { - virBufferEscapeString(buf, " %s\n", + virBufferEscapeString(buf, "%s\n", def->usage.ceph); } break; case VIR_SECRET_USAGE_TYPE_ISCSI: if (def->usage.target != NULL) { - virBufferEscapeString(buf, " %s\n", + virBufferEscapeString(buf, "%s\n", def->usage.target); } break; @@ -285,7 +286,8 @@ virSecretDefFormatUsage(virBufferPtr buf, def->usage_type); return -1; } - virBufferAddLit(buf, " \n"); + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); return 0; } @@ -303,13 +305,15 @@ virSecretDefFormat(const virSecretDef *def) uuid = def->uuid; virUUIDFormat(uuid, uuidstr); - virBufferEscapeString(&buf, " %s\n", uuidstr); + virBufferAdjustIndent(&buf, 2); + virBufferEscapeString(&buf, "%s\n", uuidstr); if (def->description != NULL) - virBufferEscapeString(&buf, " %s\n", + virBufferEscapeString(&buf, "%s\n", def->description); if (def->usage_type != VIR_SECRET_USAGE_TYPE_NONE && virSecretDefFormatUsage(&buf, def) < 0) goto error; + virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "\n"); if (virBufferError(&buf))