1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00

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.
This commit is contained in:
John Ferlan 2017-03-08 10:52:18 -05:00
parent 0cf145b67e
commit 609dac1b8f
2 changed files with 167 additions and 99 deletions

View File

@ -290,43 +290,71 @@ enum {
VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE = (1 << 1),
};
virNetworkDefPtr virNetworkDefCopy(virNetworkDefPtr def, unsigned int flags);
virNetworkDefPtr virNetworkDefParseXML(xmlXPathContextPtr ctxt);
virNetworkDefPtr virNetworkDefParseString(const char *xmlStr);
virNetworkDefPtr virNetworkDefParseFile(const char *filename);
virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml,
xmlNodePtr root);
char *virNetworkDefFormat(const virNetworkDef *def, unsigned int flags);
int virNetworkDefFormatBuf(virBufferPtr buf,
const virNetworkDef *def,
unsigned int flags);
virNetworkDefPtr
virNetworkDefCopy(virNetworkDefPtr def, unsigned int flags);
const char * virNetworkDefForwardIf(const virNetworkDef *def, size_t n);
virNetworkDefPtr
virNetworkDefParseXML(xmlXPathContextPtr ctxt);
virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net,
const char *portgroup);
virNetworkDefPtr
virNetworkDefParseString(const char *xmlStr);
virNetworkDefPtr
virNetworkDefParseFile(const char *filename);
virNetworkDefPtr
virNetworkDefParseNode(xmlDocPtr xml,
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
virNetworkDefGetIPByIndex(const virNetworkDef *def,
int family, size_t n);
int family,
size_t n);
virNetDevIPRoutePtr
virNetworkDefGetRouteByIndex(const virNetworkDef *def,
int family, size_t n);
int virNetworkIPDefPrefix(const virNetworkIPDef *def);
int virNetworkIPDefNetmask(const virNetworkIPDef *def,
virSocketAddrPtr netmask);
int family,
size_t n);
int virNetworkSaveXML(const char *configDir,
virNetworkDefPtr def,
const char *xml);
int
virNetworkIPDefPrefix(const virNetworkIPDef *def);
int virNetworkSaveConfig(const char *configDir,
virNetworkDefPtr def);
int
virNetworkIPDefNetmask(const virNetworkIPDef *def,
virSocketAddrPtr netmask);
char *virNetworkConfigFile(const char *dir,
const char *name);
int
virNetworkSaveXML(const char *configDir,
virNetworkDefPtr def,
const char *xml);
void virNetworkSetBridgeMacAddr(virNetworkDefPtr def);
int
virNetworkSaveConfig(const char *configDir,
virNetworkDefPtr def);
char *
virNetworkConfigFile(const char *dir,
const char *name);
void
virNetworkSetBridgeMacAddr(virNetworkDefPtr def);
VIR_ENUM_DECL(virNetworkForward)

View File

@ -47,8 +47,11 @@ struct _virNetworkObj {
virMacMapPtr macmap;
};
virNetworkObjPtr virNetworkObjNew(void);
void virNetworkObjEndAPI(virNetworkObjPtr *net);
virNetworkObjPtr
virNetworkObjNew(void);
void
virNetworkObjEndAPI(virNetworkObjPtr *net);
typedef struct _virNetworkObjList virNetworkObjList;
typedef virNetworkObjList *virNetworkObjListPtr;
@ -59,67 +62,98 @@ virNetworkObjIsActive(const virNetworkObj *net)
return net->active;
}
virNetworkObjListPtr virNetworkObjListNew(void);
virNetworkObjListPtr
virNetworkObjListNew(void);
virNetworkObjPtr virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets,
const unsigned char *uuid);
virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
const unsigned char *uuid);
virNetworkObjPtr virNetworkObjFindByNameLocked(virNetworkObjListPtr nets,
const char *name);
virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets,
const char *name);
bool virNetworkObjTaint(virNetworkObjPtr obj,
virNetworkTaintFlags taint);
virNetworkObjPtr
virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets,
const unsigned char *uuid);
typedef bool (*virNetworkObjListFilter)(virConnectPtr conn,
virNetworkDefPtr def);
virNetworkObjPtr
virNetworkObjFindByUUID(virNetworkObjListPtr nets,
const unsigned char *uuid);
virNetworkObjPtr virNetworkAssignDef(virNetworkObjListPtr nets,
virNetworkDefPtr def,
unsigned int flags);
void virNetworkObjAssignDef(virNetworkObjPtr network,
virNetworkDefPtr def,
bool live);
int virNetworkObjSetDefTransient(virNetworkObjPtr network, bool live);
void virNetworkObjUnsetDefTransient(virNetworkObjPtr network);
virNetworkDefPtr virNetworkObjGetPersistentDef(virNetworkObjPtr network);
int virNetworkObjReplacePersistentDef(virNetworkObjPtr network,
virNetworkDefPtr def);
int virNetworkConfigChangeSetup(virNetworkObjPtr dom, unsigned int flags);
virNetworkObjPtr
virNetworkObjFindByNameLocked(virNetworkObjListPtr nets,
const char *name);
void virNetworkRemoveInactive(virNetworkObjListPtr nets,
virNetworkObjPtr net);
virNetworkObjPtr
virNetworkObjFindByName(virNetworkObjListPtr nets,
const char *name);
int virNetworkSaveStatus(const char *statusDir,
virNetworkObjPtr net) ATTRIBUTE_RETURN_CHECK;
bool
virNetworkObjTaint(virNetworkObjPtr obj,
virNetworkTaintFlags taint);
virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets,
const char *configDir,
const char *autostartDir,
const char *file);
typedef bool
(*virNetworkObjListFilter)(virConnectPtr conn,
virNetworkDefPtr def);
virNetworkObjPtr virNetworkLoadState(virNetworkObjListPtr nets,
const char *stateDir,
const char *name);
virNetworkObjPtr
virNetworkAssignDef(virNetworkObjListPtr nets,
virNetworkDefPtr def,
unsigned int flags);
int virNetworkLoadAllConfigs(virNetworkObjListPtr nets,
const char *configDir,
const char *autostartDir);
void
virNetworkObjAssignDef(virNetworkObjPtr network,
virNetworkDefPtr def,
bool live);
int virNetworkLoadAllState(virNetworkObjListPtr nets,
const char *stateDir);
int
virNetworkObjSetDefTransient(virNetworkObjPtr network,
bool live);
int virNetworkDeleteConfig(const char *configDir,
const char *autostartDir,
virNetworkObjPtr net);
void
virNetworkObjUnsetDefTransient(virNetworkObjPtr network);
char *virNetworkConfigFile(const char *dir,
const char *name);
virNetworkDefPtr
virNetworkObjGetPersistentDef(virNetworkObjPtr network);
int virNetworkBridgeInUse(virNetworkObjListPtr nets,
const char *bridge,
const char *skipname);
int
virNetworkObjReplacePersistentDef(virNetworkObjPtr network,
virNetworkDefPtr def);
int
virNetworkConfigChangeSetup(virNetworkObjPtr dom,
unsigned int flags);
void
virNetworkRemoveInactive(virNetworkObjListPtr nets,
virNetworkObjPtr net);
int
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
virNetworkObjUpdate(virNetworkObjPtr obj,
@ -129,32 +163,38 @@ virNetworkObjUpdate(virNetworkObjPtr obj,
const char *xml,
unsigned int flags); /* virNetworkUpdateFlags */
int virNetworkObjListExport(virConnectPtr conn,
virNetworkObjListPtr netobjs,
virNetworkPtr **nets,
virNetworkObjListFilter filter,
unsigned int flags);
int
virNetworkObjListExport(virConnectPtr conn,
virNetworkObjListPtr netobjs,
virNetworkPtr **nets,
virNetworkObjListFilter filter,
unsigned int flags);
typedef int (*virNetworkObjListIterator)(virNetworkObjPtr net,
void *opaque);
int virNetworkObjListForEach(virNetworkObjListPtr nets,
virNetworkObjListIterator callback,
typedef int
(*virNetworkObjListIterator)(virNetworkObjPtr net,
void *opaque);
int virNetworkObjListGetNames(virNetworkObjListPtr nets,
bool active,
char **names,
int nnames,
virNetworkObjListFilter filter,
virConnectPtr conn);
int
virNetworkObjListForEach(virNetworkObjListPtr nets,
virNetworkObjListIterator callback,
void *opaque);
int virNetworkObjListNumOfNetworks(virNetworkObjListPtr nets,
bool active,
virNetworkObjListFilter filter,
virConnectPtr conn);
int
virNetworkObjListGetNames(virNetworkObjListPtr nets,
bool active,
char **names,
int nnames,
virNetworkObjListFilter filter,
virConnectPtr conn);
void virNetworkObjListPrune(virNetworkObjListPtr nets,
unsigned int flags);
int
virNetworkObjListNumOfNetworks(virNetworkObjListPtr nets,
bool active,
virNetworkObjListFilter filter,
virConnectPtr conn);
void
virNetworkObjListPrune(virNetworkObjListPtr nets,
unsigned int flags);
#endif /* __VIRNETWORKOBJ_H__ */