mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
virConfType: switch to VIR_ENUM_{DECL,IMPL}
There's no need to implement ToString() function like we do if we can use our shiny macros. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
4523b7769d
commit
f81a702180
@ -123,8 +123,8 @@ checkType(virConfValuePtr p, const char *filename,
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||
_("remoteReadConfigFile: %s: %s: invalid type:"
|
||||
" got %s; expected %s"), filename, key,
|
||||
virConfTypeName(p->type),
|
||||
virConfTypeName(required_type));
|
||||
virConfTypeToString(p->type),
|
||||
virConfTypeToString(required_type));
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -1211,6 +1211,8 @@ virConfNew;
|
||||
virConfReadFile;
|
||||
virConfReadMem;
|
||||
virConfSetValue;
|
||||
virConfTypeFromString;
|
||||
virConfTypeToString;
|
||||
virConfWalk;
|
||||
virConfWriteFile;
|
||||
virConfWriteMem;
|
||||
|
@ -47,8 +47,8 @@ checkType(virConfValuePtr p, const char *filename,
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||
_("remoteReadConfigFile: %s: %s: invalid type:"
|
||||
" got %s; expected %s"), filename, key,
|
||||
virConfTypeName(p->type),
|
||||
virConfTypeName(required_type));
|
||||
virConfTypeToString(p->type),
|
||||
virConfTypeToString(required_type));
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -80,6 +80,12 @@ struct _virConfParserCtxt {
|
||||
* *
|
||||
************************************************************************/
|
||||
|
||||
VIR_ENUM_IMPL(virConf, VIR_CONF_LAST,
|
||||
"*unexpected*",
|
||||
"long",
|
||||
"string",
|
||||
"list");
|
||||
|
||||
typedef struct _virConfEntry virConfEntry;
|
||||
typedef virConfEntry *virConfEntryPtr;
|
||||
|
||||
|
@ -23,6 +23,8 @@
|
||||
#ifndef __VIR_CONF_H__
|
||||
# define __VIR_CONF_H__
|
||||
|
||||
# include "virutil.h"
|
||||
|
||||
/**
|
||||
* virConfType:
|
||||
* one of the possible type for a value from the configuration file
|
||||
@ -30,12 +32,15 @@
|
||||
* TODO: we probably need a float too.
|
||||
*/
|
||||
typedef enum {
|
||||
VIR_CONF_NONE = 0, /* undefined */
|
||||
VIR_CONF_LONG = 1, /* a long int */
|
||||
VIR_CONF_STRING = 2, /* a string */
|
||||
VIR_CONF_LIST = 3 /* a list */
|
||||
VIR_CONF_NONE = 0, /* undefined */
|
||||
VIR_CONF_LONG, /* a long int */
|
||||
VIR_CONF_STRING, /* a string */
|
||||
VIR_CONF_LIST, /* a list */
|
||||
VIR_CONF_LAST, /* sentinel */
|
||||
} virConfType;
|
||||
|
||||
VIR_ENUM_DECL(virConf)
|
||||
|
||||
typedef enum {
|
||||
VIR_CONF_FLAG_VMX_FORMAT = 1, /* allow ':', '.' and '-' in names for compatibility
|
||||
with VMware VMX configuration file, but restrict
|
||||
@ -45,21 +50,6 @@ typedef enum {
|
||||
to string only and don't expect quotes for values */
|
||||
} virConfFlags;
|
||||
|
||||
static inline const char *
|
||||
virConfTypeName (virConfType t)
|
||||
{
|
||||
switch (t) {
|
||||
case VIR_CONF_LONG:
|
||||
return "long";
|
||||
case VIR_CONF_STRING:
|
||||
return "string";
|
||||
case VIR_CONF_LIST:
|
||||
return "list";
|
||||
default:
|
||||
return "*unexpected*";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* virConfValue:
|
||||
* a value from the configuration file
|
||||
|
Loading…
Reference in New Issue
Block a user