conf: namespaces: remove some copy'n'paste

[libvirt] [PATCH 15/21] conf: network: use virXMLNamespaceFormatNS

Posted by Ján Tomko 6 years, 5 months ago

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 src/conf/network_conf.c     | 2 +-
 src/network/bridge_driver.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 2c3a11fb10..7eba9eacbf 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -2435,7 +2435,7 @@ virNetworkDefFormatBuf(virBufferPtr buf,
 
     virBufferAddLit(buf, "<network");
     if (def->namespaceData && def->ns.href)
-        virBufferAsprintf(buf, " %s", (def->ns.href)());
+        virXMLNamespaceFormatNS(buf, &def->ns);
     if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0))
         virBufferAsprintf(buf, " connections='%d'", def->connections);
     if (def->ipv6nogw)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index b0ada0132a..a3f7ae337a 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -244,7 +244,7 @@ networkDnsmasqDefNamespaceFormatXML(virBufferPtr buf,
 static const char *
 networkDnsmasqDefNamespaceHref(void)
 {
-    return "xmlns:dnsmasq='" DNSMASQ_NAMESPACE_HREF "'";
+    return DNSMASQ_NAMESPACE_HREF;
 }
 
 
-- 
2.19.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 15/21] conf: network: use virXMLNamespaceFormatNS

Posted by Jiri Denemark 6 years, 5 months ago

On Wed, Aug 21, 2019 at 01:15:37 +0200, Ján Tomko wrote:
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  src/conf/network_conf.c     | 2 +-
>  src/network/bridge_driver.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
> index 2c3a11fb10..7eba9eacbf 100644
> --- a/src/conf/network_conf.c
> +++ b/src/conf/network_conf.c
> @@ -2435,7 +2435,7 @@ virNetworkDefFormatBuf(virBufferPtr buf,
>  
>      virBufferAddLit(buf, "<network");
>      if (def->namespaceData && def->ns.href)

I guess this could benefit from the same treatment you did for domains.
That is, check for def->ns.format instead.

> -        virBufferAsprintf(buf, " %s", (def->ns.href)());
> +        virXMLNamespaceFormatNS(buf, &def->ns);
>      if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0))
>          virBufferAsprintf(buf, " connections='%d'", def->connections);
>      if (def->ipv6nogw)

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list