[libvirt PATCH 0/8] Remove space-padded alignment from public headers
Erik Skultety suggested posting a separate series removing the space-padded alignment of function declarations in the public headers. Jonathon Jongsma (8): libvirt-nodedev.h: remove space-padded alignment libvirt-domain.h: remove space-padded alignment libvirt-host.h: remove space-padded alignment libvirt-interface.h: remove space-padded alignment libvirt-network.h: remove space-padded alignment libvirt-nwfilter.h: remove space-padded alignment libvirt-secret.h: remove space-padded alignment libvirt-storage.h: remove space-padded alignment include/libvirt/libvirt-domain.h | 584 ++++++++++++++-------------- include/libvirt/libvirt-host.h | 100 ++--- include/libvirt/libvirt-interface.h | 72 ++-- include/libvirt/libvirt-network.h | 92 ++--- include/libvirt/libvirt-nodedev.h | 79 ++-- include/libvirt/libvirt-nwfilter.h | 80 ++-- include/libvirt/libvirt-secret.h | 72 ++-- include/libvirt/libvirt-storage.h | 222 +++++------ 8 files changed, 652 insertions(+), 649 deletions(-) -- 2.26.2
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- include/libvirt/libvirt-nodedev.h | 79 ++++++++++++++++--------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/include/libvirt/libvirt-nodedev.h b/include/libvirt/libvirt-nodedev.h index eab8abf6ab..cfb8505e16 100644 --- a/include/libvirt/libvirt-nodedev.h +++ b/include/libvirt/libvirt-nodedev.h @@ -48,15 +48,14 @@ typedef struct _virNodeDevice virNodeDevice; typedef virNodeDevice *virNodeDevicePtr; -int virNodeNumOfDevices (virConnectPtr conn, - const char *cap, - unsigned int flags); - -int virNodeListDevices (virConnectPtr conn, - const char *cap, - char **const names, - int maxnames, - unsigned int flags); +int virNodeNumOfDevices(virConnectPtr conn, + const char *cap, + unsigned int flags); + +int virNodeListDevices(virConnectPtr conn, + const char *cap, + char **const names, + int maxnames, unsigned int flags); /* * virConnectListAllNodeDevices: * @@ -88,46 +87,50 @@ typedef enum { VIR_CONNECT_LIST_NODE_DEVICES_CAP_AP_MATRIX = 1 << 20, /* s390 AP Matrix */ } virConnectListAllNodeDeviceFlags; -int virConnectListAllNodeDevices (virConnectPtr conn, - virNodeDevicePtr **devices, - unsigned int flags); +int virConnectListAllNodeDevices(virConnectPtr conn, + virNodeDevicePtr **devices, + unsigned int flags); -virNodeDevicePtr virNodeDeviceLookupByName (virConnectPtr conn, - const char *name); +virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, + const char *name); -virNodeDevicePtr virNodeDeviceLookupSCSIHostByWWN (virConnectPtr conn, - const char *wwnn, - const char *wwpn, - unsigned int flags); +virNodeDevicePtr virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, + const char *wwnn, + const char *wwpn, + unsigned int flags); -const char * virNodeDeviceGetName (virNodeDevicePtr dev); +const char *virNodeDeviceGetName(virNodeDevicePtr dev); -const char * virNodeDeviceGetParent (virNodeDevicePtr dev); +const char *virNodeDeviceGetParent(virNodeDevicePtr dev); -int virNodeDeviceNumOfCaps (virNodeDevicePtr dev); +int virNodeDeviceNumOfCaps(virNodeDevicePtr dev); -int virNodeDeviceListCaps (virNodeDevicePtr dev, - char **const names, - int maxnames); +int virNodeDeviceListCaps(virNodeDevicePtr dev, + char **const names, + int maxnames); -char * virNodeDeviceGetXMLDesc (virNodeDevicePtr dev, - unsigned int flags); +char * virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, + unsigned int flags); -int virNodeDeviceRef (virNodeDevicePtr dev); -int virNodeDeviceFree (virNodeDevicePtr dev); +int virNodeDeviceRef(virNodeDevicePtr dev); -int virNodeDeviceDettach (virNodeDevicePtr dev); -int virNodeDeviceDetachFlags(virNodeDevicePtr dev, - const char *driverName, - unsigned int flags); -int virNodeDeviceReAttach (virNodeDevicePtr dev); -int virNodeDeviceReset (virNodeDevicePtr dev); +int virNodeDeviceFree(virNodeDevicePtr dev); -virNodeDevicePtr virNodeDeviceCreateXML (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); +int virNodeDeviceDettach(virNodeDevicePtr dev); -int virNodeDeviceDestroy (virNodeDevicePtr dev); +int virNodeDeviceDetachFlags(virNodeDevicePtr dev, + const char *driverName, + unsigned int flags); + +int virNodeDeviceReAttach(virNodeDevicePtr dev); + +int virNodeDeviceReset(virNodeDevicePtr dev); + +virNodeDevicePtr virNodeDeviceCreateXML(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); + +int virNodeDeviceDestroy(virNodeDevicePtr dev); /** * VIR_NODE_DEVICE_EVENT_CALLBACK: -- 2.26.2
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- include/libvirt/libvirt-domain.h | 584 +++++++++++++++---------------- 1 file changed, 292 insertions(+), 292 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index de2456812c..b07955fa9a 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -424,24 +424,24 @@ typedef enum { /* * Fetch scheduler parameters, caller allocates 'params' field of size 'nparams' */ -int virDomainGetSchedulerParameters (virDomainPtr domain, +int virDomainGetSchedulerParameters(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams); +int virDomainGetSchedulerParametersFlags(virDomainPtr domain, virTypedParameterPtr params, - int *nparams); -int virDomainGetSchedulerParametersFlags (virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); + int *nparams, + unsigned int flags); /* * Change scheduler parameters */ -int virDomainSetSchedulerParameters (virDomainPtr domain, +int virDomainSetSchedulerParameters(virDomainPtr domain, virTypedParameterPtr params, int nparams); -int virDomainSetSchedulerParametersFlags (virDomainPtr domain, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +int virDomainSetSchedulerParametersFlags(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + unsigned int flags); /** * virDomainBlockStats: @@ -1151,41 +1151,41 @@ char * virConnectGetDomainCapabilities(virConnectPtr conn, /* * Gather list of running domains */ -int virConnectListDomains (virConnectPtr conn, - int *ids, - int maxids); +int virConnectListDomains(virConnectPtr conn, + int *ids, + int maxids); /* * Number of domains */ -int virConnectNumOfDomains (virConnectPtr conn); +int virConnectNumOfDomains(virConnectPtr conn); /* * Get connection from domain. */ -virConnectPtr virDomainGetConnect (virDomainPtr domain); +virConnectPtr virDomainGetConnect(virDomainPtr domain); /* * Domain creation and destruction */ -virDomainPtr virDomainCreateXML (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); -virDomainPtr virDomainCreateXMLWithFiles(virConnectPtr conn, - const char *xmlDesc, - unsigned int nfiles, - int *files, - unsigned int flags); -virDomainPtr virDomainLookupByName (virConnectPtr conn, - const char *name); -virDomainPtr virDomainLookupByID (virConnectPtr conn, - int id); -virDomainPtr virDomainLookupByUUID (virConnectPtr conn, - const unsigned char *uuid); -virDomainPtr virDomainLookupByUUIDString (virConnectPtr conn, - const char *uuid); +virDomainPtr virDomainCreateXML(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); +virDomainPtr virDomainCreateXMLWithFiles(virConnectPtr conn, + const char *xmlDesc, + unsigned int nfiles, + int *files, + unsigned int flags); +virDomainPtr virDomainLookupByName(virConnectPtr conn, + const char *name); +virDomainPtr virDomainLookupByID(virConnectPtr conn, + int id); +virDomainPtr virDomainLookupByUUID(virConnectPtr conn, + const unsigned char *uuid); +virDomainPtr virDomainLookupByUUIDString(virConnectPtr conn, + const char *uuid); typedef enum { VIR_DOMAIN_SHUTDOWN_DEFAULT = 0, /* hypervisor choice */ @@ -1196,9 +1196,9 @@ typedef enum { VIR_DOMAIN_SHUTDOWN_PARAVIRT = (1 << 4), /* Use paravirt guest control */ } virDomainShutdownFlagValues; -int virDomainShutdown (virDomainPtr domain); -int virDomainShutdownFlags (virDomainPtr domain, - unsigned int flags); +int virDomainShutdown(virDomainPtr domain); +int virDomainShutdownFlags(virDomainPtr domain, + unsigned int flags); typedef enum { VIR_DOMAIN_REBOOT_DEFAULT = 0, /* hypervisor choice */ @@ -1209,12 +1209,12 @@ typedef enum { VIR_DOMAIN_REBOOT_PARAVIRT = (1 << 4), /* Use paravirt guest control */ } virDomainRebootFlagValues; -int virDomainReboot (virDomainPtr domain, - unsigned int flags); -int virDomainReset (virDomainPtr domain, - unsigned int flags); +int virDomainReboot(virDomainPtr domain, + unsigned int flags); +int virDomainReset(virDomainPtr domain, + unsigned int flags); -int virDomainDestroy (virDomainPtr domain); +int virDomainDestroy(virDomainPtr domain); /** * virDomainDestroyFlagsValues: @@ -1227,22 +1227,22 @@ typedef enum { VIR_DOMAIN_DESTROY_GRACEFUL = 1 << 0, /* only SIGTERM, no SIGKILL */ } virDomainDestroyFlagsValues; -int virDomainDestroyFlags (virDomainPtr domain, - unsigned int flags); -int virDomainRef (virDomainPtr domain); -int virDomainFree (virDomainPtr domain); +int virDomainDestroyFlags(virDomainPtr domain, + unsigned int flags); +int virDomainRef(virDomainPtr domain); +int virDomainFree(virDomainPtr domain); /* * Domain suspend/resume */ -int virDomainSuspend (virDomainPtr domain); -int virDomainResume (virDomainPtr domain); -int virDomainPMSuspendForDuration (virDomainPtr domain, - unsigned int target, - unsigned long long duration, - unsigned int flags); -int virDomainPMWakeup (virDomainPtr domain, - unsigned int flags); +int virDomainSuspend(virDomainPtr domain); +int virDomainResume(virDomainPtr domain); +int virDomainPMSuspendForDuration(virDomainPtr domain, + unsigned int target, + unsigned long long duration, + unsigned int flags); +int virDomainPMWakeup(virDomainPtr domain, + unsigned int flags); /* * Domain save/restore */ @@ -1259,77 +1259,77 @@ typedef enum { VIR_DOMAIN_SAVE_PAUSED = 1 << 2, /* Favor paused over running */ } virDomainSaveRestoreFlags; -int virDomainSave (virDomainPtr domain, - const char *to); -int virDomainSaveFlags (virDomainPtr domain, - const char *to, - const char *dxml, - unsigned int flags); -int virDomainRestore (virConnectPtr conn, - const char *from); -int virDomainRestoreFlags (virConnectPtr conn, - const char *from, - const char *dxml, - unsigned int flags); +int virDomainSave(virDomainPtr domain, + const char *to); +int virDomainSaveFlags(virDomainPtr domain, + const char *to, + const char *dxml, + unsigned int flags); +int virDomainRestore(virConnectPtr conn, + const char *from); +int virDomainRestoreFlags(virConnectPtr conn, + const char *from, + const char *dxml, + unsigned int flags); /* See below for virDomainSaveImageXMLFlags */ -char * virDomainSaveImageGetXMLDesc (virConnectPtr conn, - const char *file, - unsigned int flags); -int virDomainSaveImageDefineXML (virConnectPtr conn, - const char *file, - const char *dxml, - unsigned int flags); +char * virDomainSaveImageGetXMLDesc(virConnectPtr conn, + const char *file, + unsigned int flags); +int virDomainSaveImageDefineXML(virConnectPtr conn, + const char *file, + const char *dxml, + unsigned int flags); /* * Managed domain save */ -int virDomainManagedSave (virDomainPtr dom, - unsigned int flags); -int virDomainHasManagedSaveImage(virDomainPtr dom, - unsigned int flags); -int virDomainManagedSaveRemove(virDomainPtr dom, - unsigned int flags); -char * virDomainManagedSaveGetXMLDesc(virDomainPtr domain, - unsigned int flags); -int virDomainManagedSaveDefineXML(virDomainPtr domain, - const char *dxml, - unsigned int flags); +int virDomainManagedSave(virDomainPtr dom, + unsigned int flags); +int virDomainHasManagedSaveImage(virDomainPtr dom, + unsigned int flags); +int virDomainManagedSaveRemove(virDomainPtr dom, + unsigned int flags); +char * virDomainManagedSaveGetXMLDesc(virDomainPtr domain, + unsigned int flags); +int virDomainManagedSaveDefineXML(virDomainPtr domain, + const char *dxml, + unsigned int flags); /* * Domain core dump */ -int virDomainCoreDump (virDomainPtr domain, - const char *to, - unsigned int flags); +int virDomainCoreDump(virDomainPtr domain, + const char *to, + unsigned int flags); /* * Domain core dump with format specified */ -int virDomainCoreDumpWithFormat (virDomainPtr domain, - const char *to, - unsigned int dumpformat, - unsigned int flags); +int virDomainCoreDumpWithFormat(virDomainPtr domain, + const char *to, + unsigned int dumpformat, + unsigned int flags); /* * Screenshot of current domain console */ -char * virDomainScreenshot (virDomainPtr domain, - virStreamPtr stream, - unsigned int screen, - unsigned int flags); +char * virDomainScreenshot(virDomainPtr domain, + virStreamPtr stream, + unsigned int screen, + unsigned int flags); /* * Domain runtime information, and collecting CPU statistics */ -int virDomainGetInfo (virDomainPtr domain, - virDomainInfoPtr info); -int virDomainGetState (virDomainPtr domain, - int *state, - int *reason, - unsigned int flags); +int virDomainGetInfo(virDomainPtr domain, + virDomainInfoPtr info); +int virDomainGetState(virDomainPtr domain, + int *state, + int *reason, + unsigned int flags); /** * VIR_DOMAIN_CPU_STATS_CPUTIME: @@ -1364,15 +1364,15 @@ int virDomainGetCPUStats(virDomainPtr domain, unsigned int ncpus, unsigned int flags); -int virDomainGetControlInfo (virDomainPtr domain, - virDomainControlInfoPtr info, - unsigned int flags); +int virDomainGetControlInfo(virDomainPtr domain, + virDomainControlInfoPtr info, + unsigned int flags); /* * Return scheduler type in effect 'sedf', 'credit', 'linux' */ -char * virDomainGetSchedulerType(virDomainPtr domain, - int *nparams); +char * virDomainGetSchedulerType(virDomainPtr domain, + int *nparams); /* Manage blkio parameters. */ @@ -1442,12 +1442,12 @@ char * virDomainGetSchedulerType(virDomainPtr domain, /* Set Blkio tunables for the domain */ -int virDomainSetBlkioParameters(virDomainPtr domain, - virTypedParameterPtr params, - int nparams, unsigned int flags); -int virDomainGetBlkioParameters(virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, unsigned int flags); +int virDomainSetBlkioParameters(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, unsigned int flags); +int virDomainGetBlkioParameters(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, unsigned int flags); /* Manage memory parameters. */ @@ -1497,12 +1497,12 @@ int virDomainGetBlkioParameters(virDomainPtr domain, # define VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT "swap_hard_limit" /* Set memory tunables for the domain */ -int virDomainSetMemoryParameters(virDomainPtr domain, - virTypedParameterPtr params, - int nparams, unsigned int flags); -int virDomainGetMemoryParameters(virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, unsigned int flags); +int virDomainSetMemoryParameters(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, unsigned int flags); +int virDomainGetMemoryParameters(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, unsigned int flags); /* Memory size modification flags. */ typedef enum { @@ -1549,47 +1549,47 @@ typedef enum { */ # define VIR_DOMAIN_NUMA_MODE "numa_mode" -int virDomainSetNumaParameters(virDomainPtr domain, - virTypedParameterPtr params, - int nparams, unsigned int flags); -int virDomainGetNumaParameters(virDomainPtr domain, - virTypedParameterPtr params, - int *nparams, unsigned int flags); +int virDomainSetNumaParameters(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, unsigned int flags); +int virDomainGetNumaParameters(virDomainPtr domain, + virTypedParameterPtr params, + int *nparams, unsigned int flags); /* * Dynamic control of domains */ -const char * virDomainGetName (virDomainPtr domain); -unsigned int virDomainGetID (virDomainPtr domain); -int virDomainGetUUID (virDomainPtr domain, - unsigned char *uuid); -int virDomainGetUUIDString (virDomainPtr domain, - char *buf); -char * virDomainGetOSType (virDomainPtr domain); -unsigned long virDomainGetMaxMemory (virDomainPtr domain); -int virDomainSetMaxMemory (virDomainPtr domain, - unsigned long memory); -int virDomainSetMemory (virDomainPtr domain, - unsigned long memory); -int virDomainSetMemoryFlags (virDomainPtr domain, - unsigned long memory, - unsigned int flags); -int virDomainSetMemoryStatsPeriod (virDomainPtr domain, - int period, - unsigned int flags); -int virDomainGetMaxVcpus (virDomainPtr domain); -int virDomainGetSecurityLabel (virDomainPtr domain, - virSecurityLabelPtr seclabel); +const char * virDomainGetName(virDomainPtr domain); +unsigned int virDomainGetID(virDomainPtr domain); +int virDomainGetUUID(virDomainPtr domain, + unsigned char *uuid); +int virDomainGetUUIDString(virDomainPtr domain, + char *buf); +char * virDomainGetOSType(virDomainPtr domain); +unsigned long virDomainGetMaxMemory(virDomainPtr domain); +int virDomainSetMaxMemory(virDomainPtr domain, + unsigned long memory); +int virDomainSetMemory(virDomainPtr domain, + unsigned long memory); +int virDomainSetMemoryFlags (virDomainPtr domain, + unsigned long memory, + unsigned int flags); +int virDomainSetMemoryStatsPeriod(virDomainPtr domain, + int period, + unsigned int flags); +int virDomainGetMaxVcpus(virDomainPtr domain); +int virDomainGetSecurityLabel(virDomainPtr domain, + virSecurityLabelPtr seclabel); typedef enum { VIR_DOMAIN_GET_HOSTNAME_LEASE = (1 << 0), /* Parse DHCP lease file */ VIR_DOMAIN_GET_HOSTNAME_AGENT = (1 << 1), /* Query qemu guest agent */ } virDomainGetHostnameFlags; -char * virDomainGetHostname (virDomainPtr domain, - unsigned int flags); -int virDomainGetSecurityLabelList (virDomainPtr domain, - virSecurityLabelPtr* seclabels); +char * virDomainGetHostname(virDomainPtr domain, + unsigned int flags); +int virDomainGetSecurityLabelList(virDomainPtr domain, + virSecurityLabelPtr* seclabels); typedef enum { VIR_DOMAIN_METADATA_DESCRIPTION = 0, /* Operate on <description> */ @@ -1635,32 +1635,32 @@ typedef enum { VIR_DOMAIN_SAVE_IMAGE_XML_SECURE = VIR_DOMAIN_XML_SECURE, /* dump security sensitive information too */ } virDomainSaveImageXMLFlags; -char * virDomainGetXMLDesc (virDomainPtr domain, - unsigned int flags); - - -char * virConnectDomainXMLFromNative(virConnectPtr conn, - const char *nativeFormat, - const char *nativeConfig, - unsigned int flags); -char * virConnectDomainXMLToNative(virConnectPtr conn, - const char *nativeFormat, - const char *domainXml, - unsigned int flags); - -int virDomainBlockStats (virDomainPtr dom, - const char *disk, - virDomainBlockStatsPtr stats, - size_t size); -int virDomainBlockStatsFlags (virDomainPtr dom, - const char *disk, - virTypedParameterPtr params, - int *nparams, - unsigned int flags); -int virDomainInterfaceStats (virDomainPtr dom, - const char *device, - virDomainInterfaceStatsPtr stats, - size_t size); +char * virDomainGetXMLDesc(virDomainPtr domain, + unsigned int flags); + + +char * virConnectDomainXMLFromNative(virConnectPtr conn, + const char *nativeFormat, + const char *nativeConfig, + unsigned int flags); +char * virConnectDomainXMLToNative(virConnectPtr conn, + const char *nativeFormat, + const char *domainXml, + unsigned int flags); + +int virDomainBlockStats(virDomainPtr dom, + const char *disk, + virDomainBlockStatsPtr stats, + size_t size); +int virDomainBlockStatsFlags(virDomainPtr dom, + const char *disk, + virTypedParameterPtr params, + int *nparams, + unsigned int flags); +int virDomainInterfaceStats(virDomainPtr dom, + const char *device, + virDomainInterfaceStatsPtr stats, + size_t size); /* Management of interface parameters */ @@ -1713,23 +1713,23 @@ int virDomainInterfaceStats (virDomainPtr dom, */ # define VIR_DOMAIN_BANDWIDTH_OUT_BURST "outbound.burst" -int virDomainSetInterfaceParameters (virDomainPtr dom, - const char *device, - virTypedParameterPtr params, - int nparams, unsigned int flags); -int virDomainGetInterfaceParameters (virDomainPtr dom, - const char *device, - virTypedParameterPtr params, - int *nparams, unsigned int flags); +int virDomainSetInterfaceParameters(virDomainPtr dom, + const char *device, + virTypedParameterPtr params, + int nparams, unsigned int flags); +int virDomainGetInterfaceParameters(virDomainPtr dom, + const char *device, + virTypedParameterPtr params, + int *nparams, unsigned int flags); /* Management of domain block devices */ -int virDomainBlockPeek (virDomainPtr dom, - const char *disk, - unsigned long long offset, - size_t size, - void *buffer, - unsigned int flags); +int virDomainBlockPeek(virDomainPtr dom, + const char *disk, + unsigned long long offset, + size_t size, + void *buffer, + unsigned int flags); /** * virDomainBlockResizeFlags: @@ -1740,10 +1740,10 @@ typedef enum { VIR_DOMAIN_BLOCK_RESIZE_BYTES = 1 << 0, /* size in bytes instead of KiB */ } virDomainBlockResizeFlags; -int virDomainBlockResize (virDomainPtr dom, - const char *disk, - unsigned long long size, - unsigned int flags); +int virDomainBlockResize(virDomainPtr dom, + const char *disk, + unsigned long long size, + unsigned int flags); /** virDomainBlockInfo: * @@ -1784,17 +1784,17 @@ struct _virDomainBlockInfo { * offset, similar to 'ls') */ }; -int virDomainGetBlockInfo(virDomainPtr dom, - const char *disk, - virDomainBlockInfoPtr info, - unsigned int flags); +int virDomainGetBlockInfo(virDomainPtr dom, + const char *disk, + virDomainBlockInfoPtr info, + unsigned int flags); /* Management of domain memory */ -int virDomainMemoryStats (virDomainPtr dom, - virDomainMemoryStatPtr stats, - unsigned int nr_stats, - unsigned int flags); +int virDomainMemoryStats(virDomainPtr dom, + virDomainMemoryStatPtr stats, + unsigned int nr_stats, + unsigned int flags); /* Memory peeking flags. */ @@ -1803,11 +1803,11 @@ typedef enum { VIR_MEMORY_PHYSICAL = 1 << 1, /* addresses are physical addresses */ } virDomainMemoryFlags; -int virDomainMemoryPeek (virDomainPtr dom, - unsigned long long start, - size_t size, - void *buffer, - unsigned int flags); +int virDomainMemoryPeek(virDomainPtr dom, + unsigned long long start, + size_t size, + void *buffer, + unsigned int flags); typedef enum { VIR_DOMAIN_DEFINE_VALIDATE = (1 << 0), /* Validate the XML document against schema */ @@ -1816,13 +1816,13 @@ typedef enum { /* * defined but not running domains */ -virDomainPtr virDomainDefineXML (virConnectPtr conn, - const char *xml); +virDomainPtr virDomainDefineXML(virConnectPtr conn, + const char *xml); -virDomainPtr virDomainDefineXMLFlags (virConnectPtr conn, - const char *xml, - unsigned int flags); -int virDomainUndefine (virDomainPtr domain); +virDomainPtr virDomainDefineXMLFlags(virConnectPtr conn, + const char *xml, + unsigned int flags); +int virDomainUndefine(virDomainPtr domain); typedef enum { VIR_DOMAIN_UNDEFINE_MANAGED_SAVE = (1 << 0), /* Also remove any @@ -1841,12 +1841,12 @@ typedef enum { } virDomainUndefineFlagsValues; -int virDomainUndefineFlags (virDomainPtr domain, - unsigned int flags); -int virConnectNumOfDefinedDomains (virConnectPtr conn); -int virConnectListDefinedDomains (virConnectPtr conn, - char **const names, - int maxnames); +int virDomainUndefineFlags(virDomainPtr domain, + unsigned int flags); +int virConnectNumOfDefinedDomains(virConnectPtr conn); +int virConnectListDefinedDomains(virConnectPtr conn, + char **const names, + int maxnames); /** * virConnectListAllDomainsFlags: * @@ -1879,22 +1879,22 @@ typedef enum { VIR_CONNECT_LIST_DOMAINS_NO_CHECKPOINT = 1 << 15, } virConnectListAllDomainsFlags; -int virConnectListAllDomains (virConnectPtr conn, - virDomainPtr **domains, - unsigned int flags); -int virDomainCreate (virDomainPtr domain); -int virDomainCreateWithFlags (virDomainPtr domain, - unsigned int flags); +int virConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags); +int virDomainCreate(virDomainPtr domain); +int virDomainCreateWithFlags(virDomainPtr domain, + unsigned int flags); -int virDomainCreateWithFiles (virDomainPtr domain, - unsigned int nfiles, - int *files, - unsigned int flags); +int virDomainCreateWithFiles(virDomainPtr domain, + unsigned int nfiles, + int *files, + unsigned int flags); -int virDomainGetAutostart (virDomainPtr domain, - int *autostart); -int virDomainSetAutostart (virDomainPtr domain, - int autostart); +int virDomainGetAutostart(virDomainPtr domain, + int *autostart); +int virDomainSetAutostart(virDomainPtr domain, + int autostart); /** * virVcpuInfo: structure for information about a virtual CPU in a domain. @@ -1937,39 +1937,39 @@ typedef enum { VIR_DOMAIN_VCPU_HOTPLUGGABLE = (1 << 4), /* Make vcpus added hot(un)pluggable */ } virDomainVcpuFlags; -int virDomainSetVcpus (virDomainPtr domain, - unsigned int nvcpus); -int virDomainSetVcpusFlags (virDomainPtr domain, - unsigned int nvcpus, - unsigned int flags); -int virDomainGetVcpusFlags (virDomainPtr domain, - unsigned int flags); - -int virDomainPinVcpu (virDomainPtr domain, - unsigned int vcpu, - unsigned char *cpumap, - int maplen); -int virDomainPinVcpuFlags (virDomainPtr domain, - unsigned int vcpu, - unsigned char *cpumap, - int maplen, - unsigned int flags); - -int virDomainGetVcpuPinInfo (virDomainPtr domain, - int ncpumaps, - unsigned char *cpumaps, - int maplen, - unsigned int flags); - -int virDomainPinEmulator (virDomainPtr domain, - unsigned char *cpumap, - int maplen, - unsigned int flags); - -int virDomainGetEmulatorPinInfo (virDomainPtr domain, - unsigned char *cpumaps, - int maplen, - unsigned int flags); +int virDomainSetVcpus(virDomainPtr domain, + unsigned int nvcpus); +int virDomainSetVcpusFlags(virDomainPtr domain, + unsigned int nvcpus, + unsigned int flags); +int virDomainGetVcpusFlags(virDomainPtr domain, + unsigned int flags); + +int virDomainPinVcpu(virDomainPtr domain, + unsigned int vcpu, + unsigned char *cpumap, + int maplen); +int virDomainPinVcpuFlags(virDomainPtr domain, + unsigned int vcpu, + unsigned char *cpumap, + int maplen, + unsigned int flags); + +int virDomainGetVcpuPinInfo(virDomainPtr domain, + int ncpumaps, + unsigned char *cpumaps, + int maplen, + unsigned int flags); + +int virDomainPinEmulator(virDomainPtr domain, + unsigned char *cpumap, + int maplen, + unsigned int flags); + +int virDomainGetEmulatorPinInfo(virDomainPtr domain, + unsigned char *cpumaps, + int maplen, + unsigned int flags); /** * virIOThreadInfo: @@ -1985,22 +1985,22 @@ struct _virDomainIOThreadInfo { int cpumaplen; /* cpumap size */ }; -void virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info); - -int virDomainGetIOThreadInfo(virDomainPtr domain, - virDomainIOThreadInfoPtr **info, - unsigned int flags); -int virDomainPinIOThread(virDomainPtr domain, - unsigned int iothread_id, - unsigned char *cpumap, - int maplen, - unsigned int flags); -int virDomainAddIOThread(virDomainPtr domain, - unsigned int iothread_id, - unsigned int flags); -int virDomainDelIOThread(virDomainPtr domain, - unsigned int iothread_id, - unsigned int flags); +void virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info); + +int virDomainGetIOThreadInfo(virDomainPtr domain, + virDomainIOThreadInfoPtr **info, + unsigned int flags); +int virDomainPinIOThread(virDomainPtr domain, + unsigned int iothread_id, + unsigned char *cpumap, + int maplen, + unsigned int flags); +int virDomainAddIOThread(virDomainPtr domain, + unsigned int iothread_id, + unsigned int flags); +int virDomainDelIOThread(virDomainPtr domain, + unsigned int iothread_id, + unsigned int flags); /* IOThread set parameters */ @@ -2039,11 +2039,11 @@ int virDomainDelIOThread(virDomainPtr domain, */ # define VIR_DOMAIN_IOTHREAD_POLL_SHRINK "poll_shrink" -int virDomainSetIOThreadParams(virDomainPtr domain, - unsigned int iothread_id, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +int virDomainSetIOThreadParams(virDomainPtr domain, + unsigned int iothread_id, + virTypedParameterPtr params, + int nparams, + unsigned int flags); /** @@ -2091,11 +2091,11 @@ int virDomainSetIOThreadParams(virDomainPtr domain, # define VIR_CPU_MAPLEN(cpu) (((cpu) + 7) / 8) -int virDomainGetVcpus (virDomainPtr domain, - virVcpuInfoPtr info, - int maxinfo, - unsigned char *cpumaps, - int maplen); +int virDomainGetVcpus(virDomainPtr domain, + virVcpuInfoPtr info, + int maxinfo, + unsigned char *cpumaps, + int maplen); /** * VIR_CPU_USABLE: @@ -3015,9 +3015,9 @@ int virDomainSendProcessSignal(virDomainPtr domain, /* * Deprecated calls */ -virDomainPtr virDomainCreateLinux (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); +virDomainPtr virDomainCreateLinux(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); /* -- 2.26.2
On Wed, Jan 20, 2021 at 11:33:43AM -0600, Jonathon Jongsma wrote:
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments.
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- ...
-int virDomainSetSchedulerParameters (virDomainPtr domain, +int virDomainSetSchedulerParameters(virDomainPtr domain, virTypedParameterPtr params, int nparams);
^Mismatched indentation ...
+char * virDomainGetXMLDesc(virDomainPtr domain, + unsigned int flags); + +
Pre-existing, but please just use a single empty line. Erik
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- include/libvirt/libvirt-host.h | 100 ++++++++++++++++----------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h index 4caed94a77..bd0c625c9b 100644 --- a/include/libvirt/libvirt-host.h +++ b/include/libvirt/libvirt-host.h @@ -567,22 +567,22 @@ VIR_EXPORT_VAR virConnectAuthPtr virConnectAuthPtrDefault; # define VIR_UUID_STRING_BUFLEN (36+1) -int virGetVersion (unsigned long *libVer, - const char *type, - unsigned long *typeVer); +int virGetVersion(unsigned long *libVer, + const char *type, + unsigned long *typeVer); /* * Connection and disconnections to the Hypervisor */ -int virInitialize (void); +int virInitialize(void); -virConnectPtr virConnectOpen (const char *name); -virConnectPtr virConnectOpenReadOnly (const char *name); -virConnectPtr virConnectOpenAuth (const char *name, - virConnectAuthPtr auth, - unsigned int flags); -int virConnectRef (virConnectPtr conn); -int virConnectClose (virConnectPtr conn); +virConnectPtr virConnectOpen(const char *name); +virConnectPtr virConnectOpenReadOnly(const char *name); +virConnectPtr virConnectOpenAuth(const char *name, + virConnectAuthPtr auth, + unsigned int flags); +int virConnectRef(virConnectPtr conn); +int virConnectClose(virConnectPtr conn); /** * VIR_CONNECT_IDENTITY_USER_NAME: @@ -652,20 +652,20 @@ int virConnectClose (virConnectPtr conn); # define VIR_CONNECT_IDENTITY_SELINUX_CONTEXT "selinux-context" -int virConnectSetIdentity (virConnectPtr conn, - virTypedParameterPtr params, - int nparams, - unsigned int flags); +int virConnectSetIdentity(virConnectPtr conn, + virTypedParameterPtr params, + int nparams, + unsigned int flags); -const char * virConnectGetType (virConnectPtr conn); -int virConnectGetVersion (virConnectPtr conn, - unsigned long *hvVer); -int virConnectGetLibVersion (virConnectPtr conn, - unsigned long *libVer); -char * virConnectGetHostname (virConnectPtr conn); -char * virConnectGetURI (virConnectPtr conn); -char * virConnectGetSysinfo (virConnectPtr conn, - unsigned int flags); +const char * virConnectGetType(virConnectPtr conn); +int virConnectGetVersion(virConnectPtr conn, + unsigned long *hvVer); +int virConnectGetLibVersion(virConnectPtr conn, + unsigned long *libVer); +char * virConnectGetHostname(virConnectPtr conn); +char * virConnectGetURI(virConnectPtr conn); +char * virConnectGetSysinfo(virConnectPtr conn, + unsigned int flags); int virConnectSetKeepAlive(virConnectPtr conn, int interval, @@ -694,42 +694,42 @@ int virConnectUnregisterCloseCallback(virConnectPtr conn, * Capabilities of the connection / driver. */ -int virConnectGetMaxVcpus (virConnectPtr conn, - const char *type); -int virNodeGetInfo (virConnectPtr conn, - virNodeInfoPtr info); -char * virConnectGetCapabilities (virConnectPtr conn); +int virConnectGetMaxVcpus(virConnectPtr conn, + const char *type); +int virNodeGetInfo(virConnectPtr conn, + virNodeInfoPtr info); +char * virConnectGetCapabilities(virConnectPtr conn); -int virNodeGetCPUStats (virConnectPtr conn, - int cpuNum, - virNodeCPUStatsPtr params, - int *nparams, - unsigned int flags); +int virNodeGetCPUStats(virConnectPtr conn, + int cpuNum, + virNodeCPUStatsPtr params, + int *nparams, + unsigned int flags); -int virNodeGetMemoryStats (virConnectPtr conn, - int cellNum, - virNodeMemoryStatsPtr params, - int *nparams, - unsigned int flags); +int virNodeGetMemoryStats(virConnectPtr conn, + int cellNum, + virNodeMemoryStatsPtr params, + int *nparams, + unsigned int flags); -unsigned long long virNodeGetFreeMemory (virConnectPtr conn); +unsigned long long virNodeGetFreeMemory(virConnectPtr conn); -int virNodeGetSecurityModel (virConnectPtr conn, - virSecurityModelPtr secmodel); +int virNodeGetSecurityModel(virConnectPtr conn, + virSecurityModelPtr secmodel); -int virNodeSuspendForDuration (virConnectPtr conn, - unsigned int target, - unsigned long long duration, - unsigned int flags); +int virNodeSuspendForDuration(virConnectPtr conn, + unsigned int target, + unsigned long long duration, + unsigned int flags); /* * NUMA support */ -int virNodeGetCellsFreeMemory(virConnectPtr conn, - unsigned long long *freeMems, - int startCell, - int maxCells); +int virNodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freeMems, + int startCell, + int maxCells); int virConnectIsEncrypted(virConnectPtr conn); -- 2.26.2
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- include/libvirt/libvirt-interface.h | 72 ++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/include/libvirt/libvirt-interface.h b/include/libvirt/libvirt-interface.h index 7591c6c7fb..d23e5cd61c 100644 --- a/include/libvirt/libvirt-interface.h +++ b/include/libvirt/libvirt-interface.h @@ -42,17 +42,17 @@ typedef struct _virInterface virInterface; */ typedef virInterface *virInterfacePtr; -virConnectPtr virInterfaceGetConnect (virInterfacePtr iface); +virConnectPtr virInterfaceGetConnect(virInterfacePtr iface); -int virConnectNumOfInterfaces (virConnectPtr conn); -int virConnectListInterfaces (virConnectPtr conn, - char **const names, - int maxnames); +int virConnectNumOfInterfaces(virConnectPtr conn); +int virConnectListInterfaces(virConnectPtr conn, + char **const names, + int maxnames); -int virConnectNumOfDefinedInterfaces (virConnectPtr conn); -int virConnectListDefinedInterfaces (virConnectPtr conn, - char **const names, - int maxnames); +int virConnectNumOfDefinedInterfaces(virConnectPtr conn); +int virConnectListDefinedInterfaces(virConnectPtr conn, + char **const names, + int maxnames); /* * virConnectListAllInterfaces: * @@ -63,45 +63,45 @@ typedef enum { VIR_CONNECT_LIST_INTERFACES_ACTIVE = 1 << 1, } virConnectListAllInterfacesFlags; -int virConnectListAllInterfaces (virConnectPtr conn, - virInterfacePtr **ifaces, - unsigned int flags); +int virConnectListAllInterfaces(virConnectPtr conn, + virInterfacePtr **ifaces, + unsigned int flags); -virInterfacePtr virInterfaceLookupByName (virConnectPtr conn, - const char *name); -virInterfacePtr virInterfaceLookupByMACString (virConnectPtr conn, - const char *mac); +virInterfacePtr virInterfaceLookupByName(virConnectPtr conn, + const char *name); +virInterfacePtr virInterfaceLookupByMACString(virConnectPtr conn, + const char *mac); -const char* virInterfaceGetName (virInterfacePtr iface); -const char* virInterfaceGetMACString (virInterfacePtr iface); +const char* virInterfaceGetName(virInterfacePtr iface); +const char* virInterfaceGetMACString(virInterfacePtr iface); typedef enum { VIR_INTERFACE_XML_INACTIVE = 1 << 0 /* dump inactive interface information */ } virInterfaceXMLFlags; -char * virInterfaceGetXMLDesc (virInterfacePtr iface, - unsigned int flags); -virInterfacePtr virInterfaceDefineXML (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); +char * virInterfaceGetXMLDesc(virInterfacePtr iface, + unsigned int flags); +virInterfacePtr virInterfaceDefineXML(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); -int virInterfaceUndefine (virInterfacePtr iface); +int virInterfaceUndefine(virInterfacePtr iface); -int virInterfaceCreate (virInterfacePtr iface, - unsigned int flags); +int virInterfaceCreate(virInterfacePtr iface, + unsigned int flags); -int virInterfaceDestroy (virInterfacePtr iface, - unsigned int flags); +int virInterfaceDestroy(virInterfacePtr iface, + unsigned int flags); -int virInterfaceRef (virInterfacePtr iface); -int virInterfaceFree (virInterfacePtr iface); +int virInterfaceRef(virInterfacePtr iface); +int virInterfaceFree(virInterfacePtr iface); -int virInterfaceChangeBegin (virConnectPtr conn, - unsigned int flags); -int virInterfaceChangeCommit (virConnectPtr conn, - unsigned int flags); -int virInterfaceChangeRollback(virConnectPtr conn, - unsigned int flags); +int virInterfaceChangeBegin(virConnectPtr conn, + unsigned int flags); +int virInterfaceChangeCommit(virConnectPtr conn, + unsigned int flags); +int virInterfaceChangeRollback(virConnectPtr conn, + unsigned int flags); int virInterfaceIsActive(virInterfacePtr iface); -- 2.26.2
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- include/libvirt/libvirt-network.h | 92 +++++++++++++++---------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/include/libvirt/libvirt-network.h b/include/libvirt/libvirt-network.h index c9ff0a49ed..4462cc49e1 100644 --- a/include/libvirt/libvirt-network.h +++ b/include/libvirt/libvirt-network.h @@ -65,23 +65,23 @@ typedef virNetworkPort *virNetworkPortPtr; /* * Get connection from network. */ -virConnectPtr virNetworkGetConnect (virNetworkPtr network); +virConnectPtr virNetworkGetConnect(virNetworkPtr network); /* * List active networks */ -int virConnectNumOfNetworks (virConnectPtr conn); -int virConnectListNetworks (virConnectPtr conn, - char **const names, - int maxnames); +int virConnectNumOfNetworks(virConnectPtr conn); +int virConnectListNetworks(virConnectPtr conn, + char **const names, + int maxnames); /* * List inactive networks */ -int virConnectNumOfDefinedNetworks (virConnectPtr conn); -int virConnectListDefinedNetworks (virConnectPtr conn, - char **const names, - int maxnames); +int virConnectNumOfDefinedNetworks(virConnectPtr conn); +int virConnectListDefinedNetworks(virConnectPtr conn, + char **const names, + int maxnames); /* * virConnectListAllNetworks: * @@ -99,36 +99,36 @@ typedef enum { VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART = 1 << 5, } virConnectListAllNetworksFlags; -int virConnectListAllNetworks (virConnectPtr conn, - virNetworkPtr **nets, - unsigned int flags); +int virConnectListAllNetworks(virConnectPtr conn, + virNetworkPtr **nets, + unsigned int flags); /* * Lookup network by name or uuid */ -virNetworkPtr virNetworkLookupByName (virConnectPtr conn, - const char *name); -virNetworkPtr virNetworkLookupByUUID (virConnectPtr conn, - const unsigned char *uuid); -virNetworkPtr virNetworkLookupByUUIDString (virConnectPtr conn, - const char *uuid); +virNetworkPtr virNetworkLookupByName(virConnectPtr conn, + const char *name); +virNetworkPtr virNetworkLookupByUUID(virConnectPtr conn, + const unsigned char *uuid); +virNetworkPtr virNetworkLookupByUUIDString(virConnectPtr conn, + const char *uuid); /* * Create active transient network */ -virNetworkPtr virNetworkCreateXML (virConnectPtr conn, - const char *xmlDesc); +virNetworkPtr virNetworkCreateXML(virConnectPtr conn, + const char *xmlDesc); /* * Define inactive persistent network */ -virNetworkPtr virNetworkDefineXML (virConnectPtr conn, - const char *xmlDesc); +virNetworkPtr virNetworkDefineXML(virConnectPtr conn, + const char *xmlDesc); /* * Delete persistent network */ -int virNetworkUndefine (virNetworkPtr network); +int virNetworkUndefine(virNetworkPtr network); /** * virNetworkUpdateCommand: @@ -189,41 +189,41 @@ typedef enum { /* * Update an existing network definition */ -int virNetworkUpdate(virNetworkPtr network, - unsigned int command, /* virNetworkUpdateCommand */ - unsigned int section, /* virNetworkUpdateSection */ - int parentIndex, - const char *xml, - unsigned int flags); +int virNetworkUpdate(virNetworkPtr network, + unsigned int command, /* virNetworkUpdateCommand */ + unsigned int section, /* virNetworkUpdateSection */ + int parentIndex, + const char *xml, + unsigned int flags); /* * Activate persistent network */ -int virNetworkCreate (virNetworkPtr network); +int virNetworkCreate(virNetworkPtr network); /* * Network destroy/free */ -int virNetworkDestroy (virNetworkPtr network); -int virNetworkRef (virNetworkPtr network); -int virNetworkFree (virNetworkPtr network); +int virNetworkDestroy(virNetworkPtr network); +int virNetworkRef(virNetworkPtr network); +int virNetworkFree(virNetworkPtr network); /* * Network information */ -const char* virNetworkGetName (virNetworkPtr network); -int virNetworkGetUUID (virNetworkPtr network, - unsigned char *uuid); -int virNetworkGetUUIDString (virNetworkPtr network, - char *buf); -char * virNetworkGetXMLDesc (virNetworkPtr network, - unsigned int flags); -char * virNetworkGetBridgeName (virNetworkPtr network); - -int virNetworkGetAutostart (virNetworkPtr network, - int *autostart); -int virNetworkSetAutostart (virNetworkPtr network, - int autostart); +const char* virNetworkGetName(virNetworkPtr network); +int virNetworkGetUUID(virNetworkPtr network, + unsigned char *uuid); +int virNetworkGetUUIDString(virNetworkPtr network, + char *buf); +char * virNetworkGetXMLDesc(virNetworkPtr network, + unsigned int flags); +char * virNetworkGetBridgeName(virNetworkPtr network); + +int virNetworkGetAutostart(virNetworkPtr network, + int *autostart); +int virNetworkSetAutostart(virNetworkPtr network, + int autostart); int virNetworkIsActive(virNetworkPtr net); int virNetworkIsPersistent(virNetworkPtr net); -- 2.26.2
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- include/libvirt/libvirt-nwfilter.h | 80 +++++++++++++++--------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/include/libvirt/libvirt-nwfilter.h b/include/libvirt/libvirt-nwfilter.h index 44ca1b3fae..b9467f0de1 100644 --- a/include/libvirt/libvirt-nwfilter.h +++ b/include/libvirt/libvirt-nwfilter.h @@ -63,71 +63,71 @@ typedef virNWFilterBinding *virNWFilterBindingPtr; /* * List NWFilters */ -int virConnectNumOfNWFilters (virConnectPtr conn); -int virConnectListNWFilters (virConnectPtr conn, - char **const names, - int maxnames); -int virConnectListAllNWFilters(virConnectPtr conn, - virNWFilterPtr **filters, - unsigned int flags); +int virConnectNumOfNWFilters(virConnectPtr conn); +int virConnectListNWFilters(virConnectPtr conn, + char **const names, + int maxnames); +int virConnectListAllNWFilters(virConnectPtr conn, + virNWFilterPtr **filters, + unsigned int flags); /* * Lookup nwfilter by name or uuid */ -virNWFilterPtr virNWFilterLookupByName (virConnectPtr conn, - const char *name); -virNWFilterPtr virNWFilterLookupByUUID (virConnectPtr conn, - const unsigned char *uuid); -virNWFilterPtr virNWFilterLookupByUUIDString (virConnectPtr conn, - const char *uuid); +virNWFilterPtr virNWFilterLookupByName(virConnectPtr conn, + const char *name); +virNWFilterPtr virNWFilterLookupByUUID(virConnectPtr conn, + const unsigned char *uuid); +virNWFilterPtr virNWFilterLookupByUUIDString(virConnectPtr conn, + const char *uuid); /* * Define persistent nwfilter */ -virNWFilterPtr virNWFilterDefineXML (virConnectPtr conn, - const char *xmlDesc); +virNWFilterPtr virNWFilterDefineXML(virConnectPtr conn, + const char *xmlDesc); /* * Delete persistent nwfilter */ -int virNWFilterUndefine (virNWFilterPtr nwfilter); +int virNWFilterUndefine(virNWFilterPtr nwfilter); /* * NWFilter destroy/free */ -int virNWFilterRef (virNWFilterPtr nwfilter); -int virNWFilterFree (virNWFilterPtr nwfilter); +int virNWFilterRef(virNWFilterPtr nwfilter); +int virNWFilterFree(virNWFilterPtr nwfilter); /* * NWFilter information */ -const char* virNWFilterGetName (virNWFilterPtr nwfilter); -int virNWFilterGetUUID (virNWFilterPtr nwfilter, - unsigned char *uuid); -int virNWFilterGetUUIDString (virNWFilterPtr nwfilter, - char *buf); -char * virNWFilterGetXMLDesc (virNWFilterPtr nwfilter, - unsigned int flags); +const char* virNWFilterGetName(virNWFilterPtr nwfilter); +int virNWFilterGetUUID(virNWFilterPtr nwfilter, + unsigned char *uuid); +int virNWFilterGetUUIDString(virNWFilterPtr nwfilter, + char *buf); +char * virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, + unsigned int flags); -virNWFilterBindingPtr virNWFilterBindingLookupByPortDev(virConnectPtr conn, - const char *portdev); +virNWFilterBindingPtr virNWFilterBindingLookupByPortDev(virConnectPtr conn, + const char *portdev); -const char * virNWFilterBindingGetPortDev(virNWFilterBindingPtr binding); -const char * virNWFilterBindingGetFilterName(virNWFilterBindingPtr binding); +const char * virNWFilterBindingGetPortDev(virNWFilterBindingPtr binding); +const char * virNWFilterBindingGetFilterName(virNWFilterBindingPtr binding); -int virConnectListAllNWFilterBindings(virConnectPtr conn, - virNWFilterBindingPtr **bindings, - unsigned int flags); +int virConnectListAllNWFilterBindings(virConnectPtr conn, + virNWFilterBindingPtr **bindings, + unsigned int flags); -virNWFilterBindingPtr virNWFilterBindingCreateXML(virConnectPtr conn, - const char *xml, - unsigned int flags); +virNWFilterBindingPtr virNWFilterBindingCreateXML(virConnectPtr conn, + const char *xml, + unsigned int flags); -char * virNWFilterBindingGetXMLDesc(virNWFilterBindingPtr binding, - unsigned int flags); +char * virNWFilterBindingGetXMLDesc(virNWFilterBindingPtr binding, + unsigned int flags); -int virNWFilterBindingDelete(virNWFilterBindingPtr binding); -int virNWFilterBindingRef(virNWFilterBindingPtr binding); -int virNWFilterBindingFree(virNWFilterBindingPtr binding); +int virNWFilterBindingDelete(virNWFilterBindingPtr binding); +int virNWFilterBindingRef(virNWFilterBindingPtr binding); +int virNWFilterBindingFree(virNWFilterBindingPtr binding); #endif /* LIBVIRT_NWFILTER_H */ -- 2.26.2
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- include/libvirt/libvirt-secret.h | 72 ++++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/include/libvirt/libvirt-secret.h b/include/libvirt/libvirt-secret.h index e5aaac9450..9e3b403d15 100644 --- a/include/libvirt/libvirt-secret.h +++ b/include/libvirt/libvirt-secret.h @@ -55,11 +55,11 @@ typedef enum { # endif } virSecretUsageType; -virConnectPtr virSecretGetConnect (virSecretPtr secret); -int virConnectNumOfSecrets (virConnectPtr conn); -int virConnectListSecrets (virConnectPtr conn, - char **uuids, - int maxuuids); +virConnectPtr virSecretGetConnect(virSecretPtr secret); +int virConnectNumOfSecrets(virConnectPtr conn); +int virConnectListSecrets(virConnectPtr conn, + char **uuids, + int maxuuids); /* * virConnectListAllSecrets: @@ -78,37 +78,37 @@ typedef enum { VIR_CONNECT_LIST_SECRETS_NO_PRIVATE = 1 << 3, } virConnectListAllSecretsFlags; -int virConnectListAllSecrets(virConnectPtr conn, - virSecretPtr **secrets, - unsigned int flags); -virSecretPtr virSecretLookupByUUID(virConnectPtr conn, - const unsigned char *uuid); -virSecretPtr virSecretLookupByUUIDString(virConnectPtr conn, - const char *uuid); -virSecretPtr virSecretLookupByUsage(virConnectPtr conn, - int usageType, - const char *usageID); -virSecretPtr virSecretDefineXML (virConnectPtr conn, - const char *xml, - unsigned int flags); -int virSecretGetUUID (virSecretPtr secret, - unsigned char *buf); -int virSecretGetUUIDString (virSecretPtr secret, - char *buf); -int virSecretGetUsageType (virSecretPtr secret); -const char * virSecretGetUsageID (virSecretPtr secret); -char * virSecretGetXMLDesc (virSecretPtr secret, - unsigned int flags); -int virSecretSetValue (virSecretPtr secret, - const unsigned char *value, - size_t value_size, - unsigned int flags); -unsigned char * virSecretGetValue (virSecretPtr secret, - size_t *value_size, - unsigned int flags); -int virSecretUndefine (virSecretPtr secret); -int virSecretRef (virSecretPtr secret); -int virSecretFree (virSecretPtr secret); +int virConnectListAllSecrets(virConnectPtr conn, + virSecretPtr **secrets, + unsigned int flags); +virSecretPtr virSecretLookupByUUID(virConnectPtr conn, + const unsigned char *uuid); +virSecretPtr virSecretLookupByUUIDString(virConnectPtr conn, + const char *uuid); +virSecretPtr virSecretLookupByUsage(virConnectPtr conn, + int usageType, + const char *usageID); +virSecretPtr virSecretDefineXML(virConnectPtr conn, + const char *xml, + unsigned int flags); +int virSecretGetUUID(virSecretPtr secret, + unsigned char *buf); +int virSecretGetUUIDString(virSecretPtr secret, + char *buf); +int virSecretGetUsageType(virSecretPtr secret); +const char * virSecretGetUsageID(virSecretPtr secret); +char * virSecretGetXMLDesc(virSecretPtr secret, + unsigned int flags); +int virSecretSetValue(virSecretPtr secret, + const unsigned char *value, + size_t value_size, + unsigned int flags); +unsigned char * virSecretGetValue(virSecretPtr secret, + size_t *value_size, + unsigned int flags); +int virSecretUndefine(virSecretPtr secret); +int virSecretRef(virSecretPtr secret); +int virSecretFree(virSecretPtr secret); /** * VIR_SECRET_EVENT_CALLBACK: -- 2.26.2
Improve consistency in headers by removing the old style space-padded alignment for function names and arguments. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- include/libvirt/libvirt-storage.h | 222 +++++++++++++++--------------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 089e1e0bd1..30d92b59ed 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -191,7 +191,7 @@ typedef enum { /* * Get connection from pool. */ -virConnectPtr virStoragePoolGetConnect (virStoragePoolPtr pool); +virConnectPtr virStoragePoolGetConnect(virStoragePoolPtr pool); /* Storage Pool capabilities */ char *virConnectGetStoragePoolCapabilities(virConnectPtr conn, @@ -200,18 +200,18 @@ char *virConnectGetStoragePoolCapabilities(virConnectPtr conn, /* * List active storage pools */ -int virConnectNumOfStoragePools (virConnectPtr conn); -int virConnectListStoragePools (virConnectPtr conn, - char **const names, - int maxnames); +int virConnectNumOfStoragePools(virConnectPtr conn); +int virConnectListStoragePools(virConnectPtr conn, + char **const names, + int maxnames); /* * List inactive storage pools */ -int virConnectNumOfDefinedStoragePools(virConnectPtr conn); -int virConnectListDefinedStoragePools(virConnectPtr conn, - char **const names, - int maxnames); +int virConnectNumOfDefinedStoragePools(virConnectPtr conn); +int virConnectListDefinedStoragePools(virConnectPtr conn, + char **const names, + int maxnames); /* * virConnectListAllStoragePoolsFlags: @@ -247,149 +247,149 @@ typedef enum { VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT = 1 << 19, } virConnectListAllStoragePoolsFlags; -int virConnectListAllStoragePools(virConnectPtr conn, - virStoragePoolPtr **pools, - unsigned int flags); +int virConnectListAllStoragePools(virConnectPtr conn, + virStoragePoolPtr **pools, + unsigned int flags); /* * Query a host for storage pools of a particular type */ -char * virConnectFindStoragePoolSources(virConnectPtr conn, - const char *type, - const char *srcSpec, - unsigned int flags); +char * virConnectFindStoragePoolSources(virConnectPtr conn, + const char *type, + const char *srcSpec, + unsigned int flags); /* * Lookup pool by name or uuid */ -virStoragePoolPtr virStoragePoolLookupByName (virConnectPtr conn, - const char *name); -virStoragePoolPtr virStoragePoolLookupByUUID (virConnectPtr conn, - const unsigned char *uuid); -virStoragePoolPtr virStoragePoolLookupByUUIDString(virConnectPtr conn, - const char *uuid); -virStoragePoolPtr virStoragePoolLookupByVolume (virStorageVolPtr vol); -virStoragePoolPtr virStoragePoolLookupByTargetPath(virConnectPtr conn, - const char *path); +virStoragePoolPtr virStoragePoolLookupByName(virConnectPtr conn, + const char *name); +virStoragePoolPtr virStoragePoolLookupByUUID(virConnectPtr conn, + const unsigned char *uuid); +virStoragePoolPtr virStoragePoolLookupByUUIDString(virConnectPtr conn, + const char *uuid); +virStoragePoolPtr virStoragePoolLookupByVolume(virStorageVolPtr vol); +virStoragePoolPtr virStoragePoolLookupByTargetPath(virConnectPtr conn, + const char *path); /* * Creating/destroying pools */ -virStoragePoolPtr virStoragePoolCreateXML (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); -virStoragePoolPtr virStoragePoolDefineXML (virConnectPtr conn, - const char *xmlDesc, - unsigned int flags); -int virStoragePoolBuild (virStoragePoolPtr pool, - unsigned int flags); -int virStoragePoolUndefine (virStoragePoolPtr pool); -int virStoragePoolCreate (virStoragePoolPtr pool, - unsigned int flags); -int virStoragePoolDestroy (virStoragePoolPtr pool); -int virStoragePoolDelete (virStoragePoolPtr pool, - unsigned int flags); -int virStoragePoolRef (virStoragePoolPtr pool); -int virStoragePoolFree (virStoragePoolPtr pool); -int virStoragePoolRefresh (virStoragePoolPtr pool, - unsigned int flags); +virStoragePoolPtr virStoragePoolCreateXML(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); +virStoragePoolPtr virStoragePoolDefineXML(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); +int virStoragePoolBuild(virStoragePoolPtr pool, + unsigned int flags); +int virStoragePoolUndefine(virStoragePoolPtr pool); +int virStoragePoolCreate(virStoragePoolPtr pool, + unsigned int flags); +int virStoragePoolDestroy(virStoragePoolPtr pool); +int virStoragePoolDelete(virStoragePoolPtr pool, + unsigned int flags); +int virStoragePoolRef(virStoragePoolPtr pool); +int virStoragePoolFree(virStoragePoolPtr pool); +int virStoragePoolRefresh(virStoragePoolPtr pool, + unsigned int flags); /* * StoragePool information */ -const char* virStoragePoolGetName (virStoragePoolPtr pool); -int virStoragePoolGetUUID (virStoragePoolPtr pool, - unsigned char *uuid); -int virStoragePoolGetUUIDString (virStoragePoolPtr pool, - char *buf); +const char* virStoragePoolGetName(virStoragePoolPtr pool); +int virStoragePoolGetUUID(virStoragePoolPtr pool, + unsigned char *uuid); +int virStoragePoolGetUUIDString(virStoragePoolPtr pool, + char *buf); -int virStoragePoolGetInfo (virStoragePoolPtr vol, - virStoragePoolInfoPtr info); +int virStoragePoolGetInfo(virStoragePoolPtr vol, + virStoragePoolInfoPtr info); -char * virStoragePoolGetXMLDesc (virStoragePoolPtr pool, - unsigned int flags); +char * virStoragePoolGetXMLDesc(virStoragePoolPtr pool, + unsigned int flags); -int virStoragePoolGetAutostart (virStoragePoolPtr pool, - int *autostart); -int virStoragePoolSetAutostart (virStoragePoolPtr pool, - int autostart); +int virStoragePoolGetAutostart(virStoragePoolPtr pool, + int *autostart); +int virStoragePoolSetAutostart(virStoragePoolPtr pool, + int autostart); /* * List/lookup storage volumes within a pool */ -int virStoragePoolNumOfVolumes (virStoragePoolPtr pool); -int virStoragePoolListVolumes (virStoragePoolPtr pool, - char **const names, - int maxnames); -int virStoragePoolListAllVolumes (virStoragePoolPtr pool, - virStorageVolPtr **vols, - unsigned int flags); +int virStoragePoolNumOfVolumes(virStoragePoolPtr pool); +int virStoragePoolListVolumes(virStoragePoolPtr pool, + char **const names, + int maxnames); +int virStoragePoolListAllVolumes(virStoragePoolPtr pool, + virStorageVolPtr **vols, + unsigned int flags); -virConnectPtr virStorageVolGetConnect (virStorageVolPtr vol); +virConnectPtr virStorageVolGetConnect(virStorageVolPtr vol); /* * Lookup volumes based on various attributes */ -virStorageVolPtr virStorageVolLookupByName (virStoragePoolPtr pool, - const char *name); -virStorageVolPtr virStorageVolLookupByKey (virConnectPtr conn, - const char *key); -virStorageVolPtr virStorageVolLookupByPath (virConnectPtr conn, - const char *path); +virStorageVolPtr virStorageVolLookupByName(virStoragePoolPtr pool, + const char *name); +virStorageVolPtr virStorageVolLookupByKey(virConnectPtr conn, + const char *key); +virStorageVolPtr virStorageVolLookupByPath(virConnectPtr conn, + const char *path); -const char* virStorageVolGetName (virStorageVolPtr vol); -const char* virStorageVolGetKey (virStorageVolPtr vol); +const char* virStorageVolGetName(virStorageVolPtr vol); +const char* virStorageVolGetKey(virStorageVolPtr vol); typedef enum { VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA = 1 << 0, VIR_STORAGE_VOL_CREATE_REFLINK = 1 << 1, /* perform a btrfs lightweight copy */ } virStorageVolCreateFlags; -virStorageVolPtr virStorageVolCreateXML (virStoragePoolPtr pool, - const char *xmldesc, - unsigned int flags); -virStorageVolPtr virStorageVolCreateXMLFrom (virStoragePoolPtr pool, - const char *xmldesc, - virStorageVolPtr clonevol, - unsigned int flags); +virStorageVolPtr virStorageVolCreateXML(virStoragePoolPtr pool, + const char *xmldesc, + unsigned int flags); +virStorageVolPtr virStorageVolCreateXMLFrom(virStoragePoolPtr pool, + const char *xmldesc, + virStorageVolPtr clonevol, + unsigned int flags); typedef enum { VIR_STORAGE_VOL_DOWNLOAD_SPARSE_STREAM = 1 << 0, /* Use sparse stream */ } virStorageVolDownloadFlags; -int virStorageVolDownload (virStorageVolPtr vol, - virStreamPtr stream, - unsigned long long offset, - unsigned long long length, - unsigned int flags); +int virStorageVolDownload(virStorageVolPtr vol, + virStreamPtr stream, + unsigned long long offset, + unsigned long long length, + unsigned int flags); typedef enum { VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM = 1 << 0, /* Use sparse stream */ } virStorageVolUploadFlags; -int virStorageVolUpload (virStorageVolPtr vol, - virStreamPtr stream, - unsigned long long offset, - unsigned long long length, - unsigned int flags); -int virStorageVolDelete (virStorageVolPtr vol, - unsigned int flags); -int virStorageVolWipe (virStorageVolPtr vol, - unsigned int flags); -int virStorageVolWipePattern (virStorageVolPtr vol, - unsigned int algorithm, - unsigned int flags); -int virStorageVolRef (virStorageVolPtr vol); -int virStorageVolFree (virStorageVolPtr vol); - -int virStorageVolGetInfo (virStorageVolPtr vol, - virStorageVolInfoPtr info); -int virStorageVolGetInfoFlags (virStorageVolPtr vol, - virStorageVolInfoPtr info, - unsigned int flags); -char * virStorageVolGetXMLDesc (virStorageVolPtr pool, - unsigned int flags); - -char * virStorageVolGetPath (virStorageVolPtr vol); +int virStorageVolUpload(virStorageVolPtr vol, + virStreamPtr stream, + unsigned long long offset, + unsigned long long length, + unsigned int flags); +int virStorageVolDelete(virStorageVolPtr vol, + unsigned int flags); +int virStorageVolWipe(virStorageVolPtr vol, + unsigned int flags); +int virStorageVolWipePattern(virStorageVolPtr vol, + unsigned int algorithm, + unsigned int flags); +int virStorageVolRef(virStorageVolPtr vol); +int virStorageVolFree(virStorageVolPtr vol); + +int virStorageVolGetInfo(virStorageVolPtr vol, + virStorageVolInfoPtr info); +int virStorageVolGetInfoFlags(virStorageVolPtr vol, + virStorageVolInfoPtr info, + unsigned int flags); +char * virStorageVolGetXMLDesc(virStorageVolPtr pool, + unsigned int flags); + +char * virStorageVolGetPath(virStorageVolPtr vol); typedef enum { VIR_STORAGE_VOL_RESIZE_ALLOCATE = 1 << 0, /* force allocation of new size */ @@ -397,9 +397,9 @@ typedef enum { VIR_STORAGE_VOL_RESIZE_SHRINK = 1 << 2, /* allow decrease in capacity */ } virStorageVolResizeFlags; -int virStorageVolResize (virStorageVolPtr vol, - unsigned long long capacity, - unsigned int flags); +int virStorageVolResize(virStorageVolPtr vol, + unsigned long long capacity, + unsigned int flags); int virStoragePoolIsActive(virStoragePoolPtr pool); int virStoragePoolIsPersistent(virStoragePoolPtr pool); -- 2.26.2
On Wed, Jan 20, 2021 at 11:33:41AM -0600, Jonathon Jongsma wrote:
Erik Skultety suggested posting a separate series removing the space-padded alignment of function declarations in the public headers.
This is already an improvement. We've gradually adopted a style where function declarations are separated by a single empty line and definitions by 2 (although, as with anything we're not 100% consistent all the time). With that said, we haven't converted the headers to follow this style yet (I remember John Ferlan did this conversion for most of the sources in the past). Now, it depends whether you want to waste a few more minutes on fixing the style in headers or not, I'm okay both ways - if you think it's a waste of your time, just let me know and we'll create another warmup bitesized task for libvirt newcomers. Regardless of how you decide about the code style: Reviewed-by: Erik Skultety <eskultet@redhat.com> (I'll fix the nit if you're done with this series) Regards, Erik
On Thu, 21 Jan 2021 08:38:06 +0100 Erik Skultety <eskultet@redhat.com> wrote:
On Wed, Jan 20, 2021 at 11:33:41AM -0600, Jonathon Jongsma wrote:
Erik Skultety suggested posting a separate series removing the space-padded alignment of function declarations in the public headers.
This is already an improvement. We've gradually adopted a style where function declarations are separated by a single empty line and definitions by 2 (although, as with anything we're not 100% consistent all the time). With that said, we haven't converted the headers to follow this style yet (I remember John Ferlan did this conversion for most of the sources in the past).
Now, it depends whether you want to waste a few more minutes on fixing the style in headers or not, I'm okay both ways - if you think it's a waste of your time, just let me know and we'll create another warmup bitesized task for libvirt newcomers.
Regardless of how you decide about the code style:
Reviewed-by: Erik Skultety <eskultet@redhat.com> (I'll fix the nit if you're done with this series)
Regards, Erik
It shouldn't take much time. I'll try to go through and revise it.
participants (2)
-
Erik Skultety -
Jonathon Jongsma