maint: use enum typedef for virstorageencryption.h

Continuing the work of consistent enum cleanups; this time in
virstorageencryption.h.

* src/util/virstorageencryption.h (virStorageEncryptionFormat):
Convert to typedef, renaming to avoid collision with function.
(virStorageEncryptionSecret, virStorageEncryption): Directly use
enums.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-05-14 13:36:56 -06:00
parent 3e44cf7fc6
commit ea18f8b2b0

View File

@ -39,23 +39,23 @@ VIR_ENUM_DECL(virStorageEncryptionSecretType)
typedef struct _virStorageEncryptionSecret virStorageEncryptionSecret; typedef struct _virStorageEncryptionSecret virStorageEncryptionSecret;
typedef virStorageEncryptionSecret *virStorageEncryptionSecretPtr; typedef virStorageEncryptionSecret *virStorageEncryptionSecretPtr;
struct _virStorageEncryptionSecret { struct _virStorageEncryptionSecret {
int type; /* enum virStorageEncryptionSecretType */ virStorageEncryptionSecretType type;
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
}; };
enum virStorageEncryptionFormat { typedef enum {
/* "default" is only valid for volume creation */ /* "default" is only valid for volume creation */
VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT = 0, VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT = 0,
VIR_STORAGE_ENCRYPTION_FORMAT_QCOW, /* Both qcow and qcow2 */ VIR_STORAGE_ENCRYPTION_FORMAT_QCOW, /* Both qcow and qcow2 */
VIR_STORAGE_ENCRYPTION_FORMAT_LAST, VIR_STORAGE_ENCRYPTION_FORMAT_LAST,
}; } virStorageEncryptionFormatType;
VIR_ENUM_DECL(virStorageEncryptionFormat) VIR_ENUM_DECL(virStorageEncryptionFormat)
typedef struct _virStorageEncryption virStorageEncryption; typedef struct _virStorageEncryption virStorageEncryption;
typedef virStorageEncryption *virStorageEncryptionPtr; typedef virStorageEncryption *virStorageEncryptionPtr;
struct _virStorageEncryption { struct _virStorageEncryption {
int format; /* enum virStorageEncryptionFormat */ virStorageEncryptionFormatType format;
size_t nsecrets; size_t nsecrets;
virStorageEncryptionSecretPtr *secrets; virStorageEncryptionSecretPtr *secrets;