提交 609dac1b 编写于 作者: J John Ferlan

network: Alter coding style of network 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.
上级 0cf145b6
...@@ -290,43 +290,71 @@ enum { ...@@ -290,43 +290,71 @@ enum {
VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE = (1 << 1), VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE = (1 << 1),
}; };
virNetworkDefPtr virNetworkDefCopy(virNetworkDefPtr def, unsigned int flags); virNetworkDefPtr
virNetworkDefPtr virNetworkDefParseXML(xmlXPathContextPtr ctxt); virNetworkDefCopy(virNetworkDefPtr def, unsigned int flags);
virNetworkDefPtr virNetworkDefParseString(const char *xmlStr);
virNetworkDefPtr virNetworkDefParseFile(const char *filename); virNetworkDefPtr
virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml, virNetworkDefParseXML(xmlXPathContextPtr ctxt);
xmlNodePtr root);
char *virNetworkDefFormat(const virNetworkDef *def, unsigned int flags); virNetworkDefPtr
int virNetworkDefFormatBuf(virBufferPtr buf, virNetworkDefParseString(const char *xmlStr);
const virNetworkDef *def,
unsigned int flags); virNetworkDefPtr
virNetworkDefParseFile(const char *filename);
const char * virNetworkDefForwardIf(const virNetworkDef *def, size_t n);
virNetworkDefPtr
virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net, virNetworkDefParseNode(xmlDocPtr xml,
const char *portgroup); xmlNodePtr root);
char *
virNetworkDefFormat(const virNetworkDef *def,
unsigned int flags);
int
virNetworkDefFormatBuf(virBufferPtr buf,
const virNetworkDef *def,
unsigned int flags);
const char *
virNetworkDefForwardIf(const virNetworkDef *def,
size_t n);
virPortGroupDefPtr
virPortGroupFindByName(virNetworkDefPtr net,
const char *portgroup);
virNetworkIPDefPtr virNetworkIPDefPtr
virNetworkDefGetIPByIndex(const virNetworkDef *def, virNetworkDefGetIPByIndex(const virNetworkDef *def,
int family, size_t n); int family,
size_t n);
virNetDevIPRoutePtr virNetDevIPRoutePtr
virNetworkDefGetRouteByIndex(const virNetworkDef *def, virNetworkDefGetRouteByIndex(const virNetworkDef *def,
int family, size_t n); int family,
int virNetworkIPDefPrefix(const virNetworkIPDef *def); size_t n);
int virNetworkIPDefNetmask(const virNetworkIPDef *def,
virSocketAddrPtr netmask); int
virNetworkIPDefPrefix(const virNetworkIPDef *def);
int virNetworkSaveXML(const char *configDir, int
virNetworkDefPtr def, virNetworkIPDefNetmask(const virNetworkIPDef *def,
const char *xml); virSocketAddrPtr netmask);
int
virNetworkSaveXML(const char *configDir,
virNetworkDefPtr def,
const char *xml);
int virNetworkSaveConfig(const char *configDir, int
virNetworkDefPtr def); virNetworkSaveConfig(const char *configDir,
virNetworkDefPtr def);
char *virNetworkConfigFile(const char *dir, char *
const char *name); virNetworkConfigFile(const char *dir,
const char *name);
void virNetworkSetBridgeMacAddr(virNetworkDefPtr def); void
virNetworkSetBridgeMacAddr(virNetworkDefPtr def);
VIR_ENUM_DECL(virNetworkForward) VIR_ENUM_DECL(virNetworkForward)
......
...@@ -47,8 +47,11 @@ struct _virNetworkObj { ...@@ -47,8 +47,11 @@ struct _virNetworkObj {
virMacMapPtr macmap; virMacMapPtr macmap;
}; };
virNetworkObjPtr virNetworkObjNew(void); virNetworkObjPtr
void virNetworkObjEndAPI(virNetworkObjPtr *net); virNetworkObjNew(void);
void
virNetworkObjEndAPI(virNetworkObjPtr *net);
typedef struct _virNetworkObjList virNetworkObjList; typedef struct _virNetworkObjList virNetworkObjList;
typedef virNetworkObjList *virNetworkObjListPtr; typedef virNetworkObjList *virNetworkObjListPtr;
...@@ -59,67 +62,98 @@ virNetworkObjIsActive(const virNetworkObj *net) ...@@ -59,67 +62,98 @@ virNetworkObjIsActive(const virNetworkObj *net)
return net->active; return net->active;
} }
virNetworkObjListPtr virNetworkObjListNew(void); virNetworkObjListPtr
virNetworkObjListNew(void);
virNetworkObjPtr virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets,
const unsigned char *uuid); virNetworkObjPtr
virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets, virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets,
const unsigned char *uuid); const unsigned char *uuid);
virNetworkObjPtr virNetworkObjFindByNameLocked(virNetworkObjListPtr nets,
const char *name); virNetworkObjPtr
virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets, virNetworkObjFindByUUID(virNetworkObjListPtr nets,
const char *name); const unsigned char *uuid);
bool virNetworkObjTaint(virNetworkObjPtr obj,
virNetworkTaintFlags taint); virNetworkObjPtr
virNetworkObjFindByNameLocked(virNetworkObjListPtr nets,
typedef bool (*virNetworkObjListFilter)(virConnectPtr conn, const char *name);
virNetworkDefPtr def);
virNetworkObjPtr
virNetworkObjPtr virNetworkAssignDef(virNetworkObjListPtr nets, virNetworkObjFindByName(virNetworkObjListPtr nets,
virNetworkDefPtr def, const char *name);
unsigned int flags);
void virNetworkObjAssignDef(virNetworkObjPtr network, bool
virNetworkDefPtr def, virNetworkObjTaint(virNetworkObjPtr obj,
bool live); virNetworkTaintFlags taint);
int virNetworkObjSetDefTransient(virNetworkObjPtr network, bool live);
void virNetworkObjUnsetDefTransient(virNetworkObjPtr network); typedef bool
virNetworkDefPtr virNetworkObjGetPersistentDef(virNetworkObjPtr network); (*virNetworkObjListFilter)(virConnectPtr conn,
int virNetworkObjReplacePersistentDef(virNetworkObjPtr network, virNetworkDefPtr def);
virNetworkDefPtr def);
int virNetworkConfigChangeSetup(virNetworkObjPtr dom, unsigned int flags); virNetworkObjPtr
virNetworkAssignDef(virNetworkObjListPtr nets,
void virNetworkRemoveInactive(virNetworkObjListPtr nets, virNetworkDefPtr def,
virNetworkObjPtr net); unsigned int flags);
int virNetworkSaveStatus(const char *statusDir, void
virNetworkObjPtr net) ATTRIBUTE_RETURN_CHECK; virNetworkObjAssignDef(virNetworkObjPtr network,
virNetworkDefPtr def,
virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, bool live);
const char *configDir,
const char *autostartDir, int
const char *file); virNetworkObjSetDefTransient(virNetworkObjPtr network,
bool live);
virNetworkObjPtr virNetworkLoadState(virNetworkObjListPtr nets,
const char *stateDir, void
const char *name); virNetworkObjUnsetDefTransient(virNetworkObjPtr network);
int virNetworkLoadAllConfigs(virNetworkObjListPtr nets, virNetworkDefPtr
const char *configDir, virNetworkObjGetPersistentDef(virNetworkObjPtr network);
const char *autostartDir);
int
int virNetworkLoadAllState(virNetworkObjListPtr nets, virNetworkObjReplacePersistentDef(virNetworkObjPtr network,
const char *stateDir); virNetworkDefPtr def);
int virNetworkDeleteConfig(const char *configDir, int
const char *autostartDir, virNetworkConfigChangeSetup(virNetworkObjPtr dom,
virNetworkObjPtr net); unsigned int flags);
char *virNetworkConfigFile(const char *dir, void
const char *name); virNetworkRemoveInactive(virNetworkObjListPtr nets,
virNetworkObjPtr net);
int virNetworkBridgeInUse(virNetworkObjListPtr nets,
const char *bridge, int
const char *skipname); virNetworkSaveStatus(const char *statusDir,
virNetworkObjPtr net) ATTRIBUTE_RETURN_CHECK;
virNetworkObjPtr
virNetworkLoadConfig(virNetworkObjListPtr nets,
const char *configDir,
const char *autostartDir,
const char *file);
virNetworkObjPtr
virNetworkLoadState(virNetworkObjListPtr nets,
const char *stateDir,
const char *name);
int
virNetworkLoadAllConfigs(virNetworkObjListPtr nets,
const char *configDir,
const char *autostartDir);
int
virNetworkLoadAllState(virNetworkObjListPtr nets,
const char *stateDir);
int
virNetworkDeleteConfig(const char *configDir,
const char *autostartDir,
virNetworkObjPtr net);
int
virNetworkBridgeInUse(virNetworkObjListPtr nets,
const char *bridge,
const char *skipname);
int int
virNetworkObjUpdate(virNetworkObjPtr obj, virNetworkObjUpdate(virNetworkObjPtr obj,
...@@ -129,32 +163,38 @@ virNetworkObjUpdate(virNetworkObjPtr obj, ...@@ -129,32 +163,38 @@ virNetworkObjUpdate(virNetworkObjPtr obj,
const char *xml, const char *xml,
unsigned int flags); /* virNetworkUpdateFlags */ unsigned int flags); /* virNetworkUpdateFlags */
int virNetworkObjListExport(virConnectPtr conn, int
virNetworkObjListPtr netobjs, virNetworkObjListExport(virConnectPtr conn,
virNetworkPtr **nets, virNetworkObjListPtr netobjs,
virNetworkObjListFilter filter, virNetworkPtr **nets,
unsigned int flags); virNetworkObjListFilter filter,
unsigned int flags);
typedef int (*virNetworkObjListIterator)(virNetworkObjPtr net,
void *opaque); typedef int
(*virNetworkObjListIterator)(virNetworkObjPtr net,
int virNetworkObjListForEach(virNetworkObjListPtr nets,
virNetworkObjListIterator callback,
void *opaque); void *opaque);
int virNetworkObjListGetNames(virNetworkObjListPtr nets, int
bool active, virNetworkObjListForEach(virNetworkObjListPtr nets,
char **names, virNetworkObjListIterator callback,
int nnames, void *opaque);
virNetworkObjListFilter filter,
virConnectPtr conn);
int virNetworkObjListNumOfNetworks(virNetworkObjListPtr nets, int
bool active, virNetworkObjListGetNames(virNetworkObjListPtr nets,
virNetworkObjListFilter filter, bool active,
virConnectPtr conn); char **names,
int nnames,
virNetworkObjListFilter filter,
virConnectPtr conn);
void virNetworkObjListPrune(virNetworkObjListPtr nets, int
unsigned int flags); virNetworkObjListNumOfNetworks(virNetworkObjListPtr nets,
bool active,
virNetworkObjListFilter filter,
virConnectPtr conn);
void
virNetworkObjListPrune(virNetworkObjListPtr nets,
unsigned int flags);
#endif /* __VIRNETWORKOBJ_H__ */ #endif /* __VIRNETWORKOBJ_H__ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册