External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 22:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: replace VIR_FREE with g_free in all *Dispose() functions

Browse Source 
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Laine Stump 2021-02-03 15:14:57 -05:00
parent 85785b7b87
commit a2182cf871
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpc/virnetclient.c
View File

@ -747,12 +747,12 @@ void virNetClientDispose(void *obj)
for (i = 0; i < client->nprograms; i++)
virObjectUnref(client->programs[i]);
VIR_FREE(client->programs);
g_free(client->programs);
g_main_loop_unref(client->eventLoop);
g_main_context_unref(client->eventCtx);
VIR_FREE(client->hostname);
g_free(client->hostname);
if (client->sock)
virNetSocketRemoveIOCallback(client->sock);

6
src/rpc/virnetdaemon.c
View File

@ -99,9 +99,9 @@ virNetDaemonDispose(void *obj)
for (i = 0; i < dmn->nsignals; i++) {
sigaction(dmn->signals[i]->signum, &dmn->signals[i]->oldaction, NULL);
VIR_FREE(dmn->signals[i]);
g_free(dmn->signals[i]);
}
VIR_FREE(dmn->signals);
g_free(dmn->signals);
VIR_FORCE_CLOSE(dmn->sigread);
VIR_FORCE_CLOSE(dmn->sigwrite);
if (dmn->sigwatch > 0)
@ -109,7 +109,7 @@ virNetDaemonDispose(void *obj)
#endif /* !WIN32 */
VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd);
VIR_FREE(dmn->stateStopThread);
g_free(dmn->stateStopThread);
virHashFree(dmn->servers);

18
src/rpc/virnetlibsshsession.c
View File

@ -132,18 +132,18 @@ virNetLibsshSessionDispose(void *obj)
for (i = 0; i < sess->nauths; i++) {
virSecureEraseString(sess->auths[i]->password);
VIR_FREE(sess->auths[i]->password);
VIR_FREE(sess->auths[i]->filename);
VIR_FREE(sess->auths[i]);
g_free(sess->auths[i]->password);
g_free(sess->auths[i]->filename);
g_free(sess->auths[i]);
}
VIR_FREE(sess->auths);
g_free(sess->auths);
VIR_FREE(sess->channelCommand);
VIR_FREE(sess->hostname);
VIR_FREE(sess->knownHostsFile);
VIR_FREE(sess->authPath);
VIR_FREE(sess->username);
g_free(sess->channelCommand);
g_free(sess->hostname);
g_free(sess->knownHostsFile);
g_free(sess->authPath);
g_free(sess->username);
}
static virClassPtr virNetLibsshSessionClass;

2
src/rpc/virnetsaslcontext.c
View File

@ -699,7 +699,7 @@ void virNetSASLSessionDispose(void *obj)
if (sasl->conn)
sasl_dispose(&sasl->conn);
VIR_FREE(sasl->callbacks);
g_free(sasl->callbacks);
}
#ifdef __APPLE__

8
src/rpc/virnetserver.c
View File

@ -909,21 +909,21 @@ void virNetServerDispose(void *obj)
virNetServerPtr srv = obj;
size_t i;
VIR_FREE(srv->name);
g_free(srv->name);
virThreadPoolFree(srv->workers);
for (i = 0; i < srv->nservices; i++)
virObjectUnref(srv->services[i]);
VIR_FREE(srv->services);
g_free(srv->services);
for (i = 0; i < srv->nprograms; i++)
virObjectUnref(srv->programs[i]);
VIR_FREE(srv->programs);
g_free(srv->programs);
for (i = 0; i < srv->nclients; i++)
virObjectUnref(srv->clients[i]);
VIR_FREE(srv->clients);
g_free(srv->clients);
}
void virNetServerClose(virNetServerPtr srv)

2
src/rpc/virnetserverservice.c
View File

@ -419,7 +419,7 @@ void virNetServerServiceDispose(void *obj)
for (i = 0; i < svc->nsocks; i++)
virObjectUnref(svc->socks[i]);
VIR_FREE(svc->socks);
g_free(svc->socks);
virObjectUnref(svc->tls);
}

6
src/rpc/virnetsocket.c
View File

@ -1356,9 +1356,9 @@ void virNetSocketDispose(void *obj)
virProcessAbort(sock->pid);
VIR_FREE(sock->localAddrStrSASL);
VIR_FREE(sock->remoteAddrStrSASL);
VIR_FREE(sock->remoteAddrStrURI);
g_free(sock->localAddrStrSASL);
g_free(sock->remoteAddrStrSASL);
g_free(sock->remoteAddrStrURI);
}

8
src/rpc/virnetsshsession.c
View File

@ -151,10 +151,10 @@ virNetSSHSessionDispose(void *obj)
virNetSSHSessionAuthMethodsClear(sess);
VIR_FREE(sess->channelCommand);
VIR_FREE(sess->hostname);
VIR_FREE(sess->knownHostsFile);
VIR_FREE(sess->authPath);
g_free(sess->channelCommand);
g_free(sess->hostname);
g_free(sess->knownHostsFile);
g_free(sess->authPath);
}
static virClassPtr virNetSSHSessionClass;

6
src/rpc/virnettlscontext.c
View File

@ -1146,7 +1146,7 @@ void virNetTLSContextDispose(void *obj)
PROBE(RPC_TLS_CONTEXT_DISPOSE,
"ctxt=%p", ctxt);
VIR_FREE(ctxt->priority);
g_free(ctxt->priority);
gnutls_dh_params_deinit(ctxt->dhParams);
gnutls_certificate_free_credentials(ctxt->x509cred);
}
@ -1415,8 +1415,8 @@ void virNetTLSSessionDispose(void *obj)
PROBE(RPC_TLS_SESSION_DISPOSE,
"sess=%p", sess);
VIR_FREE(sess->x509dname);
VIR_FREE(sess->hostname);
g_free(sess->x509dname);
g_free(sess->hostname);
gnutls_deinit(sess->session);
}