[libvirt] [PATCH v2 4/6] conf: Alter coding style of nodedev function prototypes

John Ferlan jferlan at redhat.com
Thu Mar 2 16:14:25 UTC 2017


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 at redhat.com>
---
 src/conf/node_device_conf.h | 46 ++++++++++++++++++++++---------------
 src/conf/virnodedeviceobj.h | 56 ++++++++++++++++++++++++++++-----------------
 2 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 6c94262..f05e61b 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -251,26 +251,35 @@ struct _virNodeDeviceObjList {
     virNodeDeviceObjPtr *objs;
 };
 
-char *virNodeDeviceDefFormat(const virNodeDeviceDef *def);
+char *
+virNodeDeviceDefFormat(const virNodeDeviceDef *def);
 
-virNodeDeviceDefPtr virNodeDeviceDefParseString(const char *str,
-                                                int create,
-                                                const char *virt_type);
-virNodeDeviceDefPtr virNodeDeviceDefParseFile(const char *filename,
-                                              int create,
-                                              const char *virt_type);
-virNodeDeviceDefPtr virNodeDeviceDefParseNode(xmlDocPtr xml,
-                                              xmlNodePtr root,
-                                              int create,
-                                              const char *virt_type);
+virNodeDeviceDefPtr
+virNodeDeviceDefParseString(const char *str,
+                            int create,
+                            const char *virt_type);
 
-int virNodeDeviceGetWWNs(virNodeDeviceDefPtr def,
-                         char **wwnn,
-                         char **wwpn);
+virNodeDeviceDefPtr
+virNodeDeviceDefParseFile(const char *filename,
+                          int create,
+                          const char *virt_type);
 
-void virNodeDeviceDefFree(virNodeDeviceDefPtr def);
+virNodeDeviceDefPtr
+virNodeDeviceDefParseNode(xmlDocPtr xml,
+                          xmlNodePtr root,
+                          int create,
+                          const char *virt_type);
 
-void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps);
+int
+virNodeDeviceGetWWNs(virNodeDeviceDefPtr def,
+                     char **wwnn,
+                     char **wwpn);
+
+void
+virNodeDeviceDefFree(virNodeDeviceDefPtr def);
+
+void
+virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps);
 
 # define VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP \
                 (VIR_CONNECT_LIST_NODE_DEVICES_CAP_SYSTEM        | \
@@ -287,7 +296,8 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps);
                  VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC  | \
                  VIR_CONNECT_LIST_NODE_DEVICES_CAP_DRM)
 
-char *virNodeDeviceGetParentName(virConnectPtr conn,
-                                 const char *nodedev_name);
+char *
+virNodeDeviceGetParentName(virConnectPtr conn,
+                           const char *nodedev_name);
 
 #endif /* __VIR_NODE_DEVICE_CONF_H__ */
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index b4409b7..e32bbf8 100644
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -40,39 +40,53 @@ struct _virNodeDeviceDriverState {
 };
 
 
-int virNodeDeviceObjHasCap(const virNodeDeviceObj *dev, const char *cap);
+int
+virNodeDeviceObjHasCap(const virNodeDeviceObj *dev,
+                       const char *cap);
+
+virNodeDeviceObjPtr
+virNodeDeviceObjFindByName(virNodeDeviceObjListPtr devs,
+                           const char *name);
 
-virNodeDeviceObjPtr virNodeDeviceObjFindByName(virNodeDeviceObjListPtr devs,
-                                            const char *name);
 virNodeDeviceObjPtr
 virNodeDeviceObjFindBySysfsPath(virNodeDeviceObjListPtr devs,
                                 const char *sysfs_path)
     ATTRIBUTE_NONNULL(2);
 
-virNodeDeviceObjPtr virNodeDeviceObjAssignDef(virNodeDeviceObjListPtr devs,
-                                              virNodeDeviceDefPtr def);
+virNodeDeviceObjPtr
+virNodeDeviceObjAssignDef(virNodeDeviceObjListPtr devs,
+                          virNodeDeviceDefPtr def);
+
+void
+virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs,
+                       virNodeDeviceObjPtr *dev);
 
-void virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs,
-                            virNodeDeviceObjPtr *dev);
+int
+virNodeDeviceObjGetParentHost(virNodeDeviceObjListPtr devs,
+                              virNodeDeviceDefPtr def,
+                              int create);
 
-int virNodeDeviceObjGetParentHost(virNodeDeviceObjListPtr devs,
-                                  virNodeDeviceDefPtr def,
-                                  int create);
+void
+virNodeDeviceObjFree(virNodeDeviceObjPtr dev);
 
-void virNodeDeviceObjFree(virNodeDeviceObjPtr dev);
+void
+virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs);
 
-void virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs);
+void
+virNodeDeviceObjLock(virNodeDeviceObjPtr obj);
 
-void virNodeDeviceObjLock(virNodeDeviceObjPtr obj);
-void virNodeDeviceObjUnlock(virNodeDeviceObjPtr obj);
+void
+virNodeDeviceObjUnlock(virNodeDeviceObjPtr obj);
 
-typedef bool (*virNodeDeviceObjListFilter)(virConnectPtr conn,
-                                           virNodeDeviceDefPtr def);
+typedef bool
+(*virNodeDeviceObjListFilter)(virConnectPtr conn,
+                              virNodeDeviceDefPtr def);
 
-int virNodeDeviceObjListExport(virConnectPtr conn,
-                               virNodeDeviceObjList devobjs,
-                               virNodeDevicePtr **devices,
-                               virNodeDeviceObjListFilter filter,
-                               unsigned int flags);
+int
+virNodeDeviceObjListExport(virConnectPtr conn,
+                           virNodeDeviceObjList devobjs,
+                           virNodeDevicePtr **devices,
+                           virNodeDeviceObjListFilter filter,
+                           unsigned int flags);
 
 #endif /* __VIRNODEDEVICEOBJ_H__ */
-- 
2.9.3




More information about the libvir-list mailing list