From 4258a548d22589ff95b87be18f153718013a0e2d Mon Sep 17 00:00:00 2001 From: Osier Yang Date: Thu, 11 Apr 2013 11:50:23 +0800 Subject: [PATCH] cleanup: Change datatype of secret->ephemeral to boolean --- src/conf/secret_conf.c | 4 ++-- src/conf/secret_conf.h | 2 +- src/storage/storage_backend.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 8842d9a699..0c6132ab5a 100644 --- 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 53517f99fc..936635e056 100644 --- 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 2551f1f56f..ba51ff2a22 100644 --- 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; -- 2.47.2