[libvirt] [PATCH 4/4] conf: Alter coding style of interface 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: John Ferlan <jferlan(a)redhat.com>
---
src/conf/interface_conf.h | 19 ++++++++++++------
src/conf/virinterfaceobj.h | 48 ++++++++++++++++++++++++++++++----------------
2 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index 7325d65..76f37b6 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -161,14 +161,21 @@ struct _virInterfaceDef {
virInterfaceProtocolDefPtr *protos; /* ptr to array of protos[nprotos] */
};
-void virInterfaceDefFree(virInterfaceDefPtr def);
+void
+virInterfaceDefFree(virInterfaceDefPtr def);
-virInterfaceDefPtr virInterfaceDefParseString(const char *xmlStr);
-virInterfaceDefPtr virInterfaceDefParseFile(const char *filename);
-virInterfaceDefPtr virInterfaceDefParseNode(xmlDocPtr xml,
- xmlNodePtr root);
+virInterfaceDefPtr
+virInterfaceDefParseString(const char *xmlStr);
-char *virInterfaceDefFormat(const virInterfaceDef *def);
+virInterfaceDefPtr
+virInterfaceDefParseFile(const char *filename);
+
+virInterfaceDefPtr
+virInterfaceDefParseNode(xmlDocPtr xml,
+ xmlNodePtr root);
+
+char *
+virInterfaceDefFormat(const virInterfaceDef *def);
# define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \
(VIR_CONNECT_LIST_INTERFACES_ACTIVE | \
diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h
index dfda748..6c5e2e7 100644
--- a/src/conf/virinterfaceobj.h
+++ b/src/conf/virinterfaceobj.h
@@ -44,27 +44,41 @@ virInterfaceObjIsActive(const virInterfaceObj *iface)
return iface->active;
}
-int virInterfaceObjFindByMACString(virInterfaceObjListPtr interfaces,
- const char *mac,
- virInterfaceObjPtr *matches, int maxmatches);
-virInterfaceObjPtr virInterfaceObjFindByName(virInterfaceObjListPtr interfaces,
- const char *name);
+int
+virInterfaceObjFindByMACString(virInterfaceObjListPtr interfaces,
+ const char *mac,
+ virInterfaceObjPtr *matches, int maxmatches);
+virInterfaceObjPtr
+virInterfaceObjFindByName(virInterfaceObjListPtr interfaces,
+ const char *name);
-void virInterfaceObjFree(virInterfaceObjPtr iface);
-void virInterfaceObjListFree(virInterfaceObjListPtr vms);
-int virInterfaceObjListClone(virInterfaceObjListPtr src,
- virInterfaceObjListPtr dest);
+void
+virInterfaceObjFree(virInterfaceObjPtr iface);
+void
+virInterfaceObjListFree(virInterfaceObjListPtr vms);
-virInterfaceObjPtr virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces,
- virInterfaceDefPtr def);
-void virInterfaceObjRemove(virInterfaceObjListPtr interfaces,
- virInterfaceObjPtr iface);
+int
+virInterfaceObjListClone(virInterfaceObjListPtr src,
+ virInterfaceObjListPtr dest);
-void virInterfaceObjLock(virInterfaceObjPtr obj);
-void virInterfaceObjUnlock(virInterfaceObjPtr obj);
+virInterfaceObjPtr
+virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces,
+ virInterfaceDefPtr def);
+
+void
+virInterfaceObjRemove(virInterfaceObjListPtr interfaces,
+ virInterfaceObjPtr iface);
+
+void
+virInterfaceObjLock(virInterfaceObjPtr obj);
+
+void
+virInterfaceObjUnlock(virInterfaceObjPtr obj);
+
+typedef bool
+(*virInterfaceObjListFilter)(virConnectPtr conn,
+ virInterfaceDefPtr def);
-typedef bool (*virInterfaceObjListFilter)(virConnectPtr conn,
- virInterfaceDefPtr def);
#endif /* __VIRINTERFACEOBJ_H__ */
--
2.9.3