cleanup: Change datatype of secret->ephemeral to boolean

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 8842d9a69989963d21b83e5859e79f92e868ed46..0c6132ab5ab074a2c9c73129915b1f9bffd406df 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -161,9 +161,9 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root)
     prop = virXPathString("string(./@ephemeral)", ctxt);
     if (prop != NULL) {
         if (STREQ(prop, "yes"))
-            def->ephemeral = 1;
+            def->ephemeral = true;
         else if (STREQ(prop, "no"))
-            def->ephemeral = 0;
+            def->ephemeral = false;
         else {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("invalid value of 'ephemeral'"));

diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index 53517f99fc92e8e6a9c34e3c7937aee5a0f34b9b..936635e056d7816cf4890eabd5ca2880283d0bb3 100644 (file)
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -31,7 +31,7 @@ VIR_ENUM_DECL(virSecretUsageType)
 typedef struct _virSecretDef virSecretDef;
 typedef virSecretDef *virSecretDefPtr;
 struct _virSecretDef {
-    unsigned ephemeral : 1;
+    bool ephemeral;
     unsigned private : 1;
     unsigned char uuid[VIR_UUID_BUFLEN];
     char *description;          /* May be NULL */

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 2551f1f56f89d2cde3b0a2bda6f5428ef2cd94dd..ba51ff2a2283bfc99eb76496f58b2fe2d20868b6 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -480,7 +480,7 @@ virStorageGenerateQcowEncryption(virConnectPtr conn,
         goto cleanup;
     }
 
-    def->ephemeral = 0;
+    def->ephemeral = false;
     def->private = 0;
     if (virStorageGenerateSecretUUID(conn, def->uuid) < 0)
         goto cleanup;