summaryrefslogtreecommitdiff
path: root/src/libvirt.c
diff options
context:
space:
mode:
authorMichal Privoznik <mprivozn@redhat.com>2021-03-11 08:16:13 +0100
committerMichal Privoznik <mprivozn@redhat.com>2021-04-13 17:00:38 +0200
commitc8238579fb0b1c3affbd77749ae2b2c4dfafb2d6 (patch)
treec6afbdd2a2baa03b365d69018770beed4c8aff32 /src/libvirt.c
parentc21f066d61e4186fec0a2d4b4f90e901ed5b9611 (diff)
downloadlibvirt-c8238579fb0b1c3affbd77749ae2b2c4dfafb2d6.tar.gz
lib: Drop internal virXXXPtr typedefs
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>
Diffstat (limited to 'src/libvirt.c')
-rw-r--r--src/libvirt.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/libvirt.c b/src/libvirt.c
index f2f0efa0cb..80bdcd1db3 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -89,17 +89,17 @@ VIR_LOG_INIT("libvirt");
#define MAX_DRIVERS 21
-static virConnectDriverPtr virConnectDriverTab[MAX_DRIVERS];
+static virConnectDriver *virConnectDriverTab[MAX_DRIVERS];
static int virConnectDriverTabCount;
-static virStateDriverPtr virStateDriverTab[MAX_DRIVERS];
+static virStateDriver *virStateDriverTab[MAX_DRIVERS];
static int virStateDriverTabCount;
-static virNetworkDriverPtr virSharedNetworkDriver;
-static virInterfaceDriverPtr virSharedInterfaceDriver;
-static virStorageDriverPtr virSharedStorageDriver;
-static virNodeDeviceDriverPtr virSharedNodeDeviceDriver;
-static virSecretDriverPtr virSharedSecretDriver;
-static virNWFilterDriverPtr virSharedNWFilterDriver;
+static virNetworkDriver *virSharedNetworkDriver;
+static virInterfaceDriver *virSharedInterfaceDriver;
+static virStorageDriver *virSharedStorageDriver;
+static virNodeDeviceDriver *virSharedNodeDeviceDriver;
+static virSecretDriver *virSharedSecretDriver;
+static virNWFilterDriver *virSharedNWFilterDriver;
static int
@@ -357,7 +357,7 @@ DllMain(HINSTANCE instance G_GNUC_UNUSED,
* Returns 0 on success, or -1 in case of error.
*/
int
-virSetSharedNetworkDriver(virNetworkDriverPtr driver)
+virSetSharedNetworkDriver(virNetworkDriver *driver)
{
virCheckNonNullArgReturn(driver, -1);
@@ -383,7 +383,7 @@ virSetSharedNetworkDriver(virNetworkDriverPtr driver)
* Returns the driver priority or -1 in case of error.
*/
int
-virSetSharedInterfaceDriver(virInterfaceDriverPtr driver)
+virSetSharedInterfaceDriver(virInterfaceDriver *driver)
{
virCheckNonNullArgReturn(driver, -1);
@@ -409,7 +409,7 @@ virSetSharedInterfaceDriver(virInterfaceDriverPtr driver)
* Returns the driver priority or -1 in case of error.
*/
int
-virSetSharedStorageDriver(virStorageDriverPtr driver)
+virSetSharedStorageDriver(virStorageDriver *driver)
{
virCheckNonNullArgReturn(driver, -1);
@@ -435,7 +435,7 @@ virSetSharedStorageDriver(virStorageDriverPtr driver)
* Returns the driver priority or -1 in case of error.
*/
int
-virSetSharedNodeDeviceDriver(virNodeDeviceDriverPtr driver)
+virSetSharedNodeDeviceDriver(virNodeDeviceDriver *driver)
{
virCheckNonNullArgReturn(driver, -1);
@@ -461,7 +461,7 @@ virSetSharedNodeDeviceDriver(virNodeDeviceDriverPtr driver)
* Returns the driver priority or -1 in case of error.
*/
int
-virSetSharedSecretDriver(virSecretDriverPtr driver)
+virSetSharedSecretDriver(virSecretDriver *driver)
{
virCheckNonNullArgReturn(driver, -1);
@@ -487,7 +487,7 @@ virSetSharedSecretDriver(virSecretDriverPtr driver)
* Returns the driver priority or -1 in case of error.
*/
int
-virSetSharedNWFilterDriver(virNWFilterDriverPtr driver)
+virSetSharedNWFilterDriver(virNWFilterDriver *driver)
{
virCheckNonNullArgReturn(driver, -1);
@@ -515,7 +515,7 @@ virSetSharedNWFilterDriver(virNWFilterDriverPtr driver)
* Returns the driver priority or -1 in case of error.
*/
int
-virRegisterConnectDriver(virConnectDriverPtr driver,
+virRegisterConnectDriver(virConnectDriver *driver,
bool setSharedDrivers)
{
VIR_DEBUG("driver=%p name=%s", driver,
@@ -588,7 +588,7 @@ virHasDriverForURIScheme(const char *scheme)
* Returns the driver priority or -1 in case of error.
*/
int
-virRegisterStateDriver(virStateDriverPtr driver)
+virRegisterStateDriver(virStateDriver *driver)
{
virCheckNonNullArgReturn(driver, -1);
@@ -829,7 +829,7 @@ virGetVersion(unsigned long *libVer, const char *type G_GNUC_UNUSED,
static int
-virConnectGetDefaultURI(virConfPtr conf,
+virConnectGetDefaultURI(virConf *conf,
char **name)
{
const char *defname = getenv("LIBVIRT_DEFAULT_URI");
@@ -853,7 +853,7 @@ virConnectGetDefaultURI(virConfPtr conf,
* offer the suggested fix.
*/
static int
-virConnectCheckURIMissingSlash(const char *uristr, virURIPtr uri)
+virConnectCheckURIMissingSlash(const char *uristr, virURI *uri)
{
if (!uri->path || !uri->server)
return 0;
@@ -1011,7 +1011,7 @@ virConnectOpenInternal(const char *name,
goto failed;
if (virAccessManagerGetDefault() == NULL) {
- virAccessManagerPtr acl;
+ virAccessManager *acl;
virResetLastError();