提交 84017c59 编写于 作者: J John Ferlan

conf: Alter coding style of storage conf function prototypes

In an effort to be consistent with the source module, alter the function
prototypes to follow the similar style of source with the "type" on one
line followed by the function name and arguments on subsequent lines with
with argument getting it's own line.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 749c1bb3
...@@ -239,12 +239,21 @@ struct _virStoragePoolSourceList { ...@@ -239,12 +239,21 @@ struct _virStoragePoolSourceList {
virStoragePoolSourcePtr sources; virStoragePoolSourcePtr sources;
}; };
virStoragePoolDefPtr virStoragePoolDefParseXML(xmlXPathContextPtr ctxt); virStoragePoolDefPtr
virStoragePoolDefPtr virStoragePoolDefParseString(const char *xml); virStoragePoolDefParseXML(xmlXPathContextPtr ctxt);
virStoragePoolDefPtr virStoragePoolDefParseFile(const char *filename);
virStoragePoolDefPtr virStoragePoolDefParseNode(xmlDocPtr xml, virStoragePoolDefPtr
xmlNodePtr root); virStoragePoolDefParseString(const char *xml);
char *virStoragePoolDefFormat(virStoragePoolDefPtr def);
virStoragePoolDefPtr
virStoragePoolDefParseFile(const char *filename);
virStoragePoolDefPtr
virStoragePoolDefParseNode(xmlDocPtr xml,
xmlNodePtr root);
char *
virStoragePoolDefFormat(virStoragePoolDefPtr def);
typedef enum { typedef enum {
/* do not require volume capacity at all */ /* do not require volume capacity at all */
...@@ -252,38 +261,59 @@ typedef enum { ...@@ -252,38 +261,59 @@ typedef enum {
/* do not require volume capacity if the volume has a backing store */ /* do not require volume capacity if the volume has a backing store */
VIR_VOL_XML_PARSE_OPT_CAPACITY = 1 << 1, VIR_VOL_XML_PARSE_OPT_CAPACITY = 1 << 1,
} virStorageVolDefParseFlags; } virStorageVolDefParseFlags;
virStorageVolDefPtr virStorageVolDefPtr
virStorageVolDefParseString(virStoragePoolDefPtr pool, virStorageVolDefParseString(virStoragePoolDefPtr pool,
const char *xml, const char *xml,
unsigned int flags); unsigned int flags);
virStorageVolDefPtr virStorageVolDefPtr
virStorageVolDefParseFile(virStoragePoolDefPtr pool, virStorageVolDefParseFile(virStoragePoolDefPtr pool,
const char *filename, const char *filename,
unsigned int flags); unsigned int flags);
virStorageVolDefPtr virStorageVolDefPtr
virStorageVolDefParseNode(virStoragePoolDefPtr pool, virStorageVolDefParseNode(virStoragePoolDefPtr pool,
xmlDocPtr xml, xmlDocPtr xml,
xmlNodePtr root, xmlNodePtr root,
unsigned int flags); unsigned int flags);
char *virStorageVolDefFormat(virStoragePoolDefPtr pool,
virStorageVolDefPtr def); char *
virStorageVolDefFormat(virStoragePoolDefPtr pool,
int virStoragePoolSaveState(const char *stateFile, virStorageVolDefPtr def);
virStoragePoolDefPtr def);
int virStoragePoolSaveConfig(const char *configFile, int
virStoragePoolDefPtr def); virStoragePoolSaveState(const char *stateFile,
void virStorageVolDefFree(virStorageVolDefPtr def); virStoragePoolDefPtr def);
void virStoragePoolSourceClear(virStoragePoolSourcePtr source);
void virStoragePoolSourceDeviceClear(virStoragePoolSourceDevicePtr dev); int
void virStoragePoolSourceFree(virStoragePoolSourcePtr source); virStoragePoolSaveConfig(const char *configFile,
void virStoragePoolDefFree(virStoragePoolDefPtr def); virStoragePoolDefPtr def);
void
virStorageVolDefFree(virStorageVolDefPtr def);
void
virStoragePoolSourceClear(virStoragePoolSourcePtr source);
void
virStoragePoolSourceDeviceClear(virStoragePoolSourceDevicePtr dev);
void
virStoragePoolSourceFree(virStoragePoolSourcePtr source);
void
virStoragePoolDefFree(virStoragePoolDefPtr def);
virStoragePoolSourcePtr virStoragePoolSourcePtr
virStoragePoolDefParseSourceString(const char *srcSpec, virStoragePoolDefParseSourceString(const char *srcSpec,
int pool_type); int pool_type);
virStoragePoolSourcePtr virStoragePoolSourcePtr
virStoragePoolSourceListNewSource(virStoragePoolSourceListPtr list); virStoragePoolSourceListNewSource(virStoragePoolSourceListPtr list);
char *virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def);
char *
virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def);
typedef enum { typedef enum {
VIR_STORAGE_POOL_FS_AUTO = 0, VIR_STORAGE_POOL_FS_AUTO = 0,
......
...@@ -66,8 +66,9 @@ struct _virStorageDriverState { ...@@ -66,8 +66,9 @@ struct _virStorageDriverState {
virObjectEventStatePtr storageEventState; virObjectEventStatePtr storageEventState;
}; };
typedef bool (*virStoragePoolObjListFilter)(virConnectPtr conn, typedef bool
virStoragePoolDefPtr def); (*virStoragePoolObjListFilter)(virConnectPtr conn,
virStoragePoolDefPtr def);
static inline int static inline int
virStoragePoolObjIsActive(virStoragePoolObjPtr pool) virStoragePoolObjIsActive(virStoragePoolObjPtr pool)
...@@ -75,23 +76,28 @@ virStoragePoolObjIsActive(virStoragePoolObjPtr pool) ...@@ -75,23 +76,28 @@ virStoragePoolObjIsActive(virStoragePoolObjPtr pool)
return pool->active; return pool->active;
} }
int virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, int
const char *configDir, virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools,
const char *autostartDir); const char *configDir,
const char *autostartDir);
int virStoragePoolLoadAllState(virStoragePoolObjListPtr pools, int
const char *stateDir); virStoragePoolLoadAllState(virStoragePoolObjListPtr pools,
const char *stateDir);
virStoragePoolObjPtr virStoragePoolObjPtr
virStoragePoolLoadState(virStoragePoolObjListPtr pools, virStoragePoolLoadState(virStoragePoolObjListPtr pools,
const char *stateDir, const char *stateDir,
const char *name); const char *name);
virStoragePoolObjPtr virStoragePoolObjPtr
virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools,
const unsigned char *uuid); const unsigned char *uuid);
virStoragePoolObjPtr virStoragePoolObjPtr
virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, virStoragePoolObjFindByName(virStoragePoolObjListPtr pools,
const char *name); const char *name);
virStoragePoolObjPtr virStoragePoolObjPtr
virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool,
virStoragePoolDefPtr def); virStoragePoolDefPtr def);
...@@ -99,44 +105,61 @@ virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, ...@@ -99,44 +105,61 @@ virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool,
virStorageVolDefPtr virStorageVolDefPtr
virStorageVolDefFindByKey(virStoragePoolObjPtr pool, virStorageVolDefFindByKey(virStoragePoolObjPtr pool,
const char *key); const char *key);
virStorageVolDefPtr virStorageVolDefPtr
virStorageVolDefFindByPath(virStoragePoolObjPtr pool, virStorageVolDefFindByPath(virStoragePoolObjPtr pool,
const char *path); const char *path);
virStorageVolDefPtr virStorageVolDefPtr
virStorageVolDefFindByName(virStoragePoolObjPtr pool, virStorageVolDefFindByName(virStoragePoolObjPtr pool,
const char *name); const char *name);
void virStoragePoolObjClearVols(virStoragePoolObjPtr pool); void
virStoragePoolObjClearVols(virStoragePoolObjPtr pool);
virStoragePoolObjPtr virStoragePoolObjPtr
virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools,
virStoragePoolDefPtr def); virStoragePoolDefPtr def);
int virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, int
virStoragePoolObjPtr pool, virStoragePoolObjSaveDef(virStorageDriverStatePtr driver,
virStoragePoolDefPtr def); virStoragePoolObjPtr pool,
int virStoragePoolObjDeleteDef(virStoragePoolObjPtr pool); virStoragePoolDefPtr def);
int
virStoragePoolObjDeleteDef(virStoragePoolObjPtr pool);
void
virStoragePoolObjFree(virStoragePoolObjPtr pool);
void
virStoragePoolObjListFree(virStoragePoolObjListPtr pools);
void
virStoragePoolObjRemove(virStoragePoolObjListPtr pools,
virStoragePoolObjPtr pool);
void virStoragePoolObjFree(virStoragePoolObjPtr pool); int
void virStoragePoolObjListFree(virStoragePoolObjListPtr pools); virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools,
void virStoragePoolObjRemove(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def,
virStoragePoolObjPtr pool); unsigned int check_active);
int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, int
virStoragePoolDefPtr def, virStoragePoolSourceFindDuplicate(virConnectPtr conn,
unsigned int check_active); virStoragePoolObjListPtr pools,
virStoragePoolDefPtr def);
int virStoragePoolSourceFindDuplicate(virConnectPtr conn, void
virStoragePoolObjListPtr pools, virStoragePoolObjLock(virStoragePoolObjPtr obj);
virStoragePoolDefPtr def);
void virStoragePoolObjLock(virStoragePoolObjPtr obj); void
void virStoragePoolObjUnlock(virStoragePoolObjPtr obj); virStoragePoolObjUnlock(virStoragePoolObjPtr obj);
int virStoragePoolObjListExport(virConnectPtr conn, int
virStoragePoolObjList poolobjs, virStoragePoolObjListExport(virConnectPtr conn,
virStoragePoolPtr **pools, virStoragePoolObjList poolobjs,
virStoragePoolObjListFilter filter, virStoragePoolPtr **pools,
unsigned int flags); virStoragePoolObjListFilter filter,
unsigned int flags);
#endif /* __VIRSTORAGEOBJ_H__ */ #endif /* __VIRSTORAGEOBJ_H__ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册