conf: secret: Provide only virSecretDefParse

Replace the virSecretDefParseFile/String shims by calls to
virSecretDefParse.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index d41d8157cdab7613d48aef39230e6732569b1aeb..629a4a57f7bb43b497929c051c80dda2d3f58b26 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -174,7 +174,7 @@ virSecretParseXML(xmlXPathContext *ctxt)
 }
 
 
-static virSecretDef *
+virSecretDef *
 virSecretDefParse(const char *xmlStr,
                   const char *filename,
                   unsigned int flags)
@@ -190,18 +190,6 @@ virSecretDefParse(const char *xmlStr,
     return virSecretParseXML(ctxt);
 }
 
-virSecretDef *
-virSecretDefParseString(const char *xmlStr,
-                        unsigned int flags)
-{
-    return virSecretDefParse(xmlStr, NULL, flags);
-}
-
-virSecretDef *
-virSecretDefParseFile(const char *filename)
-{
-    return virSecretDefParse(NULL, filename, 0);
-}
 
 static int
 virSecretDefFormatUsage(virBuffer *buf,

diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index 36d50407fd30322a6adf811a31a6aca989427736..dee98899ac946639f79e0c90c799271490565b8e 100644 (file)
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -35,8 +35,11 @@ struct _virSecretDef {
 void virSecretDefFree(virSecretDef *def);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSecretDef, virSecretDefFree);
 
-virSecretDef *virSecretDefParseString(const char *xml, unsigned int flags);
-virSecretDef *virSecretDefParseFile(const char *filename);
+virSecretDef *
+virSecretDefParse(const char *xmlStr,
+                  const char *filename,
+                  unsigned int flags);
+
 char *virSecretDefFormat(const virSecretDef *def);
 
 #define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \

diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index 4032cd1e9aa30cfb1d1c4cfa48530d8809bb7601..4929f741550391fa79214396e530f70535504bf1 100644 (file)
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -870,7 +870,7 @@ virSecretLoad(virSecretObjList *secrets,
     virSecretDef *def = NULL;
     virSecretObj *obj = NULL;
 
-    if (!(def = virSecretDefParseFile(path)))
+    if (!(def = virSecretDefParse(NULL, path, 0)))
         goto cleanup;
 
     if (virSecretLoadValidateUUID(def, file) < 0)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c1ecd1ab048ce27b5d40deba0910259b43b21629..6334cbb448e7b472bba0e4e2ac08b19336e24496 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1010,8 +1010,7 @@ virObjectEventStateQueue;
 # conf/secret_conf.h
 virSecretDefFormat;
 virSecretDefFree;
-virSecretDefParseFile;
-virSecretDefParseString;
+virSecretDefParse;
 virSecretUsageTypeFromString;
 virSecretUsageTypeToString;
 

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 6328589fa4528ff2940576711332539edfc2e1cf..bd981a8ace65f4514a487d08670058d85f3d54e7 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -207,7 +207,7 @@ secretDefineXML(virConnectPtr conn,
 
     virCheckFlags(VIR_SECRET_DEFINE_VALIDATE, NULL);
 
-    if (!(def = virSecretDefParseString(xml, flags)))
+    if (!(def = virSecretDefParse(xml, NULL, flags)))
         return NULL;
 
     if (virSecretDefineXMLEnsureACL(conn, def) < 0)

diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c
index 828e44a32bd58ecdebe3f9ffcc376d8cc6352c22..eb4d3e143cd8e414dad9ef8178ccf36b152de3f9 100644 (file)
--- a/tests/secretxml2xmltest.c
+++ b/tests/secretxml2xmltest.c
@@ -13,7 +13,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
     g_autofree char *actual = NULL;
     g_autoptr(virSecretDef) secret = NULL;
 
-    if (!(secret = virSecretDefParseFile(inxml)))
+    if (!(secret = virSecretDefParse(NULL, inxml, 0)))
         return -1;
 
     if (!(actual = virSecretDefFormat(secret)))