Move virEmitXMLWarning into xml.h

The virEmitXMLWarning function should always have been in
the xml.[hc] files, and should use virXML as its name
prefix

* src/util/util.c, src/util/util.h: Remove virEmitXMLWarning
* src/util/xml.c, src/util/xml.h: Add virXMLEmitWarning

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 8a83f0726023e4dc8cc59a648995731c9ba8feb5..ce71d8b6ef25b004c838f2f18595d387e148114d 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1081,7 +1081,6 @@ virArgvToString;
 virAsprintf;
 virBuildPathInternal;
 virDirCreate;
-virEmitXMLWarning;
 virEnumFromString;
 virEnumToString;
 virEventAddHandle;

diff --git a/src/util/util.c b/src/util/util.c
index baa0f1261121b33c31988c57afb553fc581ca6c9..09062f684afd394834f9305e420b0e82cbe9b38c 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -2472,42 +2472,3 @@ bool virIsDevMapperDevice(const char *dev_name ATTRIBUTE_UNUSED)
     return false;
 }
 #endif
-
-int virEmitXMLWarning(int fd,
-                      const char *name,
-                      const char *cmd) {
-    size_t len;
-    const char *prologue = "<!--\n\
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE \n\
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n\
-  virsh ";
-    const char *epilogue = "\n\
-or other application using the libvirt API.\n\
--->\n\n";
-
-    if (fd < 0 || !name || !cmd) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    len = strlen(prologue);
-    if (safewrite(fd, prologue, len) != len)
-        return -1;
-
-    len = strlen(cmd);
-    if (safewrite(fd, cmd, len) != len)
-        return -1;
-
-    if (safewrite(fd, " ", 1) != 1)
-        return -1;
-
-    len = strlen(name);
-    if (safewrite(fd, name, len) != len)
-        return -1;
-
-    len = strlen(epilogue);
-    if (safewrite(fd, epilogue, len) != len)
-        return -1;
-
-    return 0;
-}

diff --git a/src/util/util.h b/src/util/util.h
index 96491e57b9e0edd8d0b5e357b62a3d9d654e6d11..f62cb42b617c179bef8b2da2e4c398c9d4f87134 100644 (file)
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -238,8 +238,4 @@ int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL;
 
 bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);
 
-int virEmitXMLWarning(int fd,
-                      const char *name,
-                      const char *cmd) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
-
 #endif /* __VIR_UTIL_H__ */

diff --git a/src/util/xml.c b/src/util/xml.c
index 2909e85386a6c8ff6b2250268d9c68f8a0fb7d1e..c633521ce84de8d8c6c6039e34256b1fb0ea12c9 100644 (file)
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -801,6 +801,47 @@ error:
 }
 
 
+static int virXMLEmitWarning(int fd,
+                             const char *name,
+                             const char *cmd)
+{
+    size_t len;
+    const char *prologue = "<!--\n\
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE \n\
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n\
+  virsh ";
+    const char *epilogue = "\n\
+or other application using the libvirt API.\n\
+-->\n\n";
+
+    if (fd < 0 || !name || !cmd) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    len = strlen(prologue);
+    if (safewrite(fd, prologue, len) != len)
+        return -1;
+
+    len = strlen(cmd);
+    if (safewrite(fd, cmd, len) != len)
+        return -1;
+
+    if (safewrite(fd, " ", 1) != 1)
+        return -1;
+
+    len = strlen(name);
+    if (safewrite(fd, name, len) != len)
+        return -1;
+
+    len = strlen(epilogue);
+    if (safewrite(fd, epilogue, len) != len)
+        return -1;
+
+    return 0;
+}
+
+
 struct virXMLRewritFileData {
     const char *warnName;
     const char *warnCommand;
@@ -813,7 +854,7 @@ virXMLRewriteFile(int fd, void *opaque)
     struct virXMLRewritFileData *data = opaque;
 
     if (data->warnName && data->warnCommand) {
-        if (virEmitXMLWarning(fd, data->warnName, data->warnCommand) < 0)
+        if (virXMLEmitWarning(fd, data->warnName, data->warnCommand) < 0)
             return -1;
     }