NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

lib: Drop internal virXXXPtr typedefs

Browse Source 
Historically, we declared pointer type to our types:

  typedef struct _virXXX virXXX;
  typedef virXXX *virXXXPtr;

But usefulness of such declaration is questionable, at best.
Unfortunately, we can't drop every such declaration - we have to
carry some over, because they are part of public API (e.g.
virDomainPtr). But for internal types - we can do drop them and
use what every other C project uses 'virXXX *'.

This change was generated by a very ugly shell script that
generated sed script which was then called over each file in the
repository. For the shell script refer to the cover letter:

https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik
2021-03-11 08:16:13 +01:00
parent c21f066d61
commit c8238579fb
734 changed files with 29338 additions and 30231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/datatypes.h
View File

@@ -28,24 +28,24 @@
#include "virobject.h"
#include "viruuid.h"
extern virClassPtr virConnectClass;
extern virClassPtr virDomainClass;
extern virClassPtr virDomainCheckpointClass;
extern virClassPtr virDomainSnapshotClass;
extern virClassPtr virInterfaceClass;
extern virClassPtr virNetworkClass;
extern virClassPtr virNetworkPortClass;
extern virClassPtr virNodeDeviceClass;
extern virClassPtr virNWFilterClass;
extern virClassPtr virNWFilterBindingClass;
extern virClassPtr virSecretClass;
extern virClassPtr virStreamClass;
extern virClassPtr virStorageVolClass;
extern virClassPtr virStoragePoolClass;
extern virClass *virConnectClass;
extern virClass *virDomainClass;
extern virClass *virDomainCheckpointClass;
extern virClass *virDomainSnapshotClass;
extern virClass *virInterfaceClass;
extern virClass *virNetworkClass;
extern virClass *virNetworkPortClass;
extern virClass *virNodeDeviceClass;
extern virClass *virNWFilterClass;
extern virClass *virNWFilterBindingClass;
extern virClass *virSecretClass;
extern virClass *virStreamClass;
extern virClass *virStorageVolClass;
extern virClass *virStoragePoolClass;
extern virClassPtr virAdmConnectClass;
extern virClassPtr virAdmServerClass;
extern virClassPtr virAdmClientClass;
extern virClass *virAdmConnectClass;
extern virClass *virAdmServerClass;
extern virClass *virAdmClientClass;
#define virCheckConnectReturn(obj, retval) \
do { \
@@ -480,9 +480,7 @@ extern virClassPtr virAdmClientClass;
typedef struct _virConnectCloseCallbackData virConnectCloseCallbackData;
typedef virConnectCloseCallbackData *virConnectCloseCallbackDataPtr;
typedef struct _virAdmConnectCloseCallbackData virAdmConnectCloseCallbackData;
typedef virAdmConnectCloseCallbackData *virAdmConnectCloseCallbackDataPtr;
/**
* Internal structures holding data related to connection close callbacks.
@@ -519,16 +517,16 @@ struct _virConnect {
* them.
*/
unsigned int flags; /* a set of connection flags */
virURIPtr uri; /* connection URI */
virURI *uri; /* connection URI */
/* The underlying hypervisor driver and network driver. */
virHypervisorDriverPtr driver;
virNetworkDriverPtr networkDriver;
virInterfaceDriverPtr interfaceDriver;
virStorageDriverPtr storageDriver;
virNodeDeviceDriverPtr nodeDeviceDriver;
virSecretDriverPtr secretDriver;
virNWFilterDriverPtr nwfilterDriver;
virHypervisorDriver *driver;
virNetworkDriver *networkDriver;
virInterfaceDriver *interfaceDriver;
virStorageDriver *storageDriver;
virNodeDeviceDriver *nodeDeviceDriver;
virSecretDriver *secretDriver;
virNWFilterDriver *nwfilterDriver;
/* Private data pointer which can be used by domain driver as
* it pleases.
@@ -558,13 +556,13 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virConnect, virObjectUnref);
*/
struct _virAdmConnect {
virObjectLockable parent;
virURIPtr uri;
virURI *uri;
void *privateData;
virFreeCallback privateDataFreeFunc;
/* Per-connection close callback */
virAdmConnectCloseCallbackDataPtr closeCallback;
virAdmConnectCloseCallbackData *closeCallback;
};
/**
@@ -736,7 +734,7 @@ struct _virStream {
virConnectPtr conn;
unsigned int flags;
virStreamDriverPtr driver;
virStreamDriver *driver;
void *privateData;
virFreeCallback ff;
};
@@ -853,23 +851,23 @@ bool virConnectWasDisposed(void);
void virAdmConnectWatchDispose(void);
bool virAdmConnectWasDisposed(void);
virConnectCloseCallbackDataPtr virNewConnectCloseCallbackData(void);
void virConnectCloseCallbackDataRegister(virConnectCloseCallbackDataPtr close,
virConnectCloseCallbackData *virNewConnectCloseCallbackData(void);
void virConnectCloseCallbackDataRegister(virConnectCloseCallbackData *close,
virConnectPtr conn,
virConnectCloseFunc cb,
void *opaque,
virFreeCallback freecb);
void virConnectCloseCallbackDataUnregister(virConnectCloseCallbackDataPtr close,
void virConnectCloseCallbackDataUnregister(virConnectCloseCallbackData *close,
virConnectCloseFunc cb);
void virConnectCloseCallbackDataCall(virConnectCloseCallbackDataPtr close,
void virConnectCloseCallbackDataCall(virConnectCloseCallbackData *close,
int reason);
virConnectCloseFunc
virConnectCloseCallbackDataGetCallback(virConnectCloseCallbackDataPtr close);
void virAdmConnectCloseCallbackDataReset(virAdmConnectCloseCallbackDataPtr cbdata);
int virAdmConnectCloseCallbackDataRegister(virAdmConnectCloseCallbackDataPtr cbdata,
virConnectCloseCallbackDataGetCallback(virConnectCloseCallbackData *close);
void virAdmConnectCloseCallbackDataReset(virAdmConnectCloseCallbackData *cbdata);
int virAdmConnectCloseCallbackDataRegister(virAdmConnectCloseCallbackData *cbdata,
virAdmConnectPtr conn,
virAdmConnectCloseFunc cb,
void *opaque,
virFreeCallback freecb);
int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackDataPtr cbdata,
int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackData *cbdata,
virAdmConnectCloseFunc cb);