---
src/rpc/virkeepalive.c | 6 +++---
src/rpc/virnetclient.c | 22 +++++++++++-----------
src/rpc/virnetclientprogram.c | 6 +++---
src/rpc/virnetclientstream.c | 14 +++++++-------
src/rpc/virnetmessage.c | 18 +++++++++---------
src/rpc/virnetsaslcontext.c | 28 ++++++++++++++--------------
src/rpc/virnetserver.c | 30 +++++++++++++++---------------
src/rpc/virnetserverclient.c | 18 +++++++++---------
src/rpc/virnetserverprogram.c | 8 ++++----
src/rpc/virnetserverservice.c | 12 ++++++------
src/rpc/virnetsocket.c | 36 ++++++++++++++++++------------------
src/rpc/virnetsshsession.c | 26 +++++++++++++-------------
src/rpc/virnettlscontext.c | 28 ++++++++++++++--------------
13 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index f5c48b7..c882313 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -108,7 +108,7 @@ virKeepAliveMessage(virKeepAlivePtr ka, int proc)
return msg;
-error:
+ error:
VIR_WARN("Failed to generate keepalive %s", procstr);
return NULL;
}
@@ -181,7 +181,7 @@ virKeepAliveTimer(int timer ATTRIBUTE_UNUSED, void *opaque)
virObjectLock(ka);
virObjectUnref(ka);
-cleanup:
+ cleanup:
virObjectUnlock(ka);
}
@@ -294,7 +294,7 @@ virKeepAliveStart(virKeepAlivePtr ka,
virObjectRef(ka);
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(ka);
return ret;
}
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 255997b..a156fe1 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -329,7 +329,7 @@ static virNetClientPtr virNetClientNew(virNetSocketPtr sock,
client, client->sock);
return client;
-error:
+ error:
VIR_FORCE_CLOSE(wakeupFD[0]);
VIR_FORCE_CLOSE(wakeupFD[1]);
virObjectUnref(client);
@@ -484,7 +484,7 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host,
goto cleanup;
sock = NULL;
-cleanup:
+ cleanup:
VIR_FREE(command);
VIR_FREE(privkey);
VIR_FREE(knownhosts);
@@ -494,7 +494,7 @@ cleanup:
virObjectUnref(sock);
return ret;
-no_memory:
+ no_memory:
virReportOOMError();
goto cleanup;
}
@@ -834,7 +834,7 @@ int virNetClientSetTLSSession(virNetClientPtr client,
virObjectUnlock(client);
return 0;
-error:
+ error:
virObjectUnref(client->tls);
client->tls = NULL;
virObjectUnlock(client);
@@ -886,7 +886,7 @@ int virNetClientAddProgram(virNetClientPtr client,
virObjectUnlock(client);
return 0;
-error:
+ error:
virObjectUnlock(client);
return -1;
}
@@ -905,7 +905,7 @@ int virNetClientAddStream(virNetClientPtr client,
virObjectUnlock(client);
return 0;
-error:
+ error:
virObjectUnlock(client);
return -1;
}
@@ -926,7 +926,7 @@ void virNetClientRemoveStream(virNetClientPtr client,
VIR_DELETE_ELEMENT(client->streams, i, client->nstreams);
virObjectUnref(st);
-cleanup:
+ cleanup:
virObjectUnlock(client);
}
@@ -1597,7 +1597,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client,
}
}
-error:
+ error:
virNetClientCallRemove(&client->waitDispatch, thiscall);
virNetClientIOEventLoopPassTheBuck(client, thiscall);
return -1;
@@ -1792,7 +1792,7 @@ static int virNetClientIO(virNetClientPtr client,
virGetLastError())
rv = -1;
-cleanup:
+ cleanup:
VIR_DEBUG("All done with our call head=%p call=%p rv=%d",
client->waitDispatch, thiscall, rv);
return rv;
@@ -1843,7 +1843,7 @@ void virNetClientIncomingEvent(virNetSocketPtr sock,
NULL);
virNetClientIOUpdateCallback(client, true);
-done:
+ done:
if (client->wantClose && !client->haveTheBuck) {
virNetClientCloseLocked(client);
virNetClientCallRemovePredicate(&client->waitDispatch,
@@ -1900,7 +1900,7 @@ virNetClientCallNew(virNetMessagePtr msg,
return call;
-error:
+ error:
VIR_FREE(call);
return NULL;
}
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 3ff27d3..e620dec 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -188,7 +188,7 @@ virNetClientProgramDispatchError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
ret = 0;
-cleanup:
+ cleanup:
xdr_free((xdrproc_t)xdr_virNetMessageError, (void*)&err);
return ret;
}
@@ -262,7 +262,7 @@ int virNetClientProgramDispatch(virNetClientProgramPtr prog,
xdr_free(event->msg_filter, evdata);
-cleanup:
+ cleanup:
VIR_FREE(evdata);
return 0;
}
@@ -394,7 +394,7 @@ int virNetClientProgramCall(virNetClientProgramPtr prog,
return 0;
-error:
+ error:
virNetMessageFree(msg);
if (infds && ninfds) {
for (i = 0; i < *ninfds; i++)
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 521bdda..b428f4b 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -254,7 +254,7 @@ int virNetClientStreamSetError(virNetClientStreamPtr st,
ret = 0;
-cleanup:
+ cleanup:
xdr_free((xdrproc_t)xdr_virNetMessageError, (void*)&err);
virObjectUnlock(st);
return ret;
@@ -296,7 +296,7 @@ int virNetClientStreamQueuePacket(virNetClientStreamPtr st,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(st);
return ret;
}
@@ -350,7 +350,7 @@ int virNetClientStreamSendPacket(virNetClientStreamPtr st,
return nbytes;
-error:
+ error:
virNetMessageFree(msg);
return -1;
}
@@ -415,7 +415,7 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st,
virNetClientStreamEventTimerUpdate(st);
-cleanup:
+ cleanup:
virObjectUnlock(st);
return rv;
}
@@ -455,7 +455,7 @@ int virNetClientStreamEventAddCallback(virNetClientStreamPtr st,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(st);
return ret;
}
@@ -478,7 +478,7 @@ int virNetClientStreamEventUpdateCallback(virNetClientStreamPtr st,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(st);
return ret;
}
@@ -505,7 +505,7 @@ int virNetClientStreamEventRemoveCallback(virNetClientStreamPtr st)
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(st);
return ret;
}
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index 4e8e17d..19b2d6c 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -152,7 +152,7 @@ int virNetMessageDecodeLength(virNetMessagePtr msg)
ret = 0;
-cleanup:
+ cleanup:
xdr_destroy(&xdr);
return ret;
}
@@ -197,7 +197,7 @@ int virNetMessageDecodeHeader(virNetMessagePtr msg)
ret = 0;
-cleanup:
+ cleanup:
xdr_destroy(&xdr);
return ret;
}
@@ -257,7 +257,7 @@ int virNetMessageEncodeHeader(virNetMessagePtr msg)
ret = 0;
-cleanup:
+ cleanup:
xdr_destroy(&xdr);
return ret;
}
@@ -289,7 +289,7 @@ int virNetMessageEncodeNumFDs(virNetMessagePtr msg)
ret = 0;
-cleanup:
+ cleanup:
xdr_destroy(&xdr);
return ret;
}
@@ -327,7 +327,7 @@ int virNetMessageDecodeNumFDs(virNetMessagePtr msg)
ret = 0;
-cleanup:
+ cleanup:
xdr_destroy(&xdr);
return ret;
}
@@ -386,7 +386,7 @@ int virNetMessageEncodePayload(virNetMessagePtr msg,
msg->bufferOffset = 0;
return 0;
-error:
+ error:
xdr_destroy(&xdr);
return -1;
}
@@ -414,7 +414,7 @@ int virNetMessageDecodePayload(virNetMessagePtr msg,
xdr_destroy(&xdr);
return 0;
-error:
+ error:
xdr_destroy(&xdr);
return -1;
}
@@ -466,7 +466,7 @@ int virNetMessageEncodePayloadRaw(virNetMessagePtr msg,
msg->bufferOffset = 0;
return 0;
-error:
+ error:
xdr_destroy(&xdr);
return -1;
}
@@ -491,7 +491,7 @@ int virNetMessageEncodePayloadEmpty(virNetMessagePtr msg)
msg->bufferOffset = 0;
return 0;
-error:
+ error:
xdr_destroy(&xdr);
return -1;
}
diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index abf3334..37a5da2 100644
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -159,7 +159,7 @@ int virNetSASLContextCheckIdentity(virNetSASLContextPtr ctxt,
_("Client's username is not on the list of allowed clients"));
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(ctxt);
return ret;
}
@@ -198,7 +198,7 @@ virNetSASLSessionPtr virNetSASLSessionNewClient(virNetSASLContextPtr ctxt ATTRIB
return sasl;
-cleanup:
+ cleanup:
virObjectUnref(sasl);
return NULL;
}
@@ -234,7 +234,7 @@ virNetSASLSessionPtr virNetSASLSessionNewServer(virNetSASLContextPtr ctxt ATTRIB
return sasl;
-cleanup:
+ cleanup:
virObjectUnref(sasl);
return NULL;
}
@@ -256,7 +256,7 @@ int virNetSASLSessionExtKeySize(virNetSASLSessionPtr sasl,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
@@ -282,7 +282,7 @@ const char *virNetSASLSessionGetIdentity(virNetSASLSessionPtr sasl)
}
VIR_DEBUG("SASL client username %s", (const char *)val);
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return (const char*)val;
}
@@ -305,7 +305,7 @@ int virNetSASLSessionGetKeySize(virNetSASLSessionPtr sasl)
}
ssf = *(const int *)val;
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ssf;
}
@@ -341,7 +341,7 @@ int virNetSASLSessionSecProps(virNetSASLSessionPtr sasl,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
@@ -392,7 +392,7 @@ char *virNetSASLSessionListMechanisms(virNetSASLSessionPtr sasl)
}
ignore_value(VIR_STRDUP(ret, mechlist));
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
@@ -441,7 +441,7 @@ int virNetSASLSessionClientStart(virNetSASLSessionPtr sasl,
break;
}
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
@@ -490,7 +490,7 @@ int virNetSASLSessionClientStep(virNetSASLSessionPtr sasl,
break;
}
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
@@ -536,7 +536,7 @@ int virNetSASLSessionServerStart(virNetSASLSessionPtr sasl,
break;
}
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
@@ -581,7 +581,7 @@ int virNetSASLSessionServerStep(virNetSASLSessionPtr sasl,
break;
}
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
@@ -629,7 +629,7 @@ ssize_t virNetSASLSessionEncode(virNetSASLSessionPtr sasl,
}
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
@@ -667,7 +667,7 @@ ssize_t virNetSASLSessionDecode(virNetSASLSessionPtr sasl,
}
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(sasl);
return ret;
}
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 14fd102..7e3fc0a 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -175,10 +175,10 @@ static int virNetServerProcessMsg(virNetServerPtr srv,
msg) < 0)
goto cleanup;
-done:
+ done:
ret = 0;
-cleanup:
+ cleanup:
return ret;
}
@@ -198,7 +198,7 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque)
VIR_FREE(job);
return;
-error:
+ error:
virObjectUnref(job->prog);
virNetMessageFree(job->msg);
virNetServerClientClose(job->client);
@@ -252,7 +252,7 @@ static int virNetServerDispatchNewMessage(virNetServerClientPtr client,
ret = virNetServerProcessMsg(srv, client, prog, msg);
}
-cleanup:
+ cleanup:
virObjectUnlock(srv);
return ret;
@@ -306,7 +306,7 @@ static int virNetServerAddClient(virNetServerPtr srv,
virObjectUnlock(srv);
return 0;
-error:
+ error:
virObjectUnlock(srv);
return -1;
}
@@ -403,7 +403,7 @@ virNetServerPtr virNetServerNew(size_t min_workers,
return srv;
-error:
+ error:
virObjectUnref(srv);
return NULL;
}
@@ -564,7 +564,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object,
return srv;
-error:
+ error:
virObjectUnref(srv);
return NULL;
}
@@ -672,7 +672,7 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv)
return object;
-error:
+ error:
virJSONValueFree(object);
virObjectUnlock(srv);
return NULL;
@@ -729,7 +729,7 @@ static void virNetServerGotInhibitReply(DBusPendingCall *pending,
}
dbus_message_unref(reply);
-cleanup:
+ cleanup:
virObjectUnlock(srv);
}
@@ -879,7 +879,7 @@ virNetServerSignalEvent(int watch,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unexpected signal received: %d"), siginfo.si_signo);
-cleanup:
+ cleanup:
virObjectUnlock(srv);
}
@@ -911,7 +911,7 @@ static int virNetServerSignalSetup(virNetServerPtr srv)
return 0;
-error:
+ error:
VIR_FORCE_CLOSE(fds[0]);
VIR_FORCE_CLOSE(fds[1]);
return -1;
@@ -952,7 +952,7 @@ int virNetServerAddSignalHandler(virNetServerPtr srv,
virObjectUnlock(srv);
return 0;
-error:
+ error:
VIR_FREE(sigdata);
virObjectUnlock(srv);
return -1;
@@ -988,7 +988,7 @@ int virNetServerAddService(virNetServerPtr srv,
virObjectUnlock(srv);
return 0;
-error:
+ error:
virObjectUnlock(srv);
return -1;
}
@@ -1006,7 +1006,7 @@ int virNetServerAddProgram(virNetServerPtr srv,
virObjectUnlock(srv);
return 0;
-error:
+ error:
virObjectUnlock(srv);
return -1;
}
@@ -1169,7 +1169,7 @@ void virNetServerRun(virNetServerPtr srv)
}
}
-cleanup:
+ cleanup:
virObjectUnlock(srv);
}
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 1251b2d..3493ef5 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -389,7 +389,7 @@ virNetServerClientNewInternal(virNetSocketPtr sock,
return client;
-error:
+ error:
virObjectUnref(client);
return NULL;
}
@@ -506,7 +506,7 @@ virNetServerClientPtr virNetServerClientNewPostExecRestart(virJSONValuePtr objec
return client;
-error:
+ error:
virObjectUnref(client);
return NULL;
}
@@ -549,7 +549,7 @@ virJSONValuePtr virNetServerClientPreExecRestart(virNetServerClientPtr client)
virObjectUnlock(client);
return object;
-error:
+ error:
virObjectUnlock(client);
virJSONValueFree(object);
return NULL;
@@ -767,7 +767,7 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
seccontext) < 0)
goto error;
-cleanup:
+ cleanup:
VIR_FREE(username);
VIR_FREE(userid);
VIR_FREE(groupname);
@@ -783,7 +783,7 @@ cleanup:
#endif
return ret;
-error:
+ error:
virObjectUnref(ret);
ret = NULL;
goto cleanup;
@@ -1085,7 +1085,7 @@ int virNetServerClientInit(virNetServerClientPtr client)
virObjectUnlock(client);
return 0;
-error:
+ error:
client->wantClose = true;
virObjectUnlock(client);
return -1;
@@ -1130,7 +1130,7 @@ static ssize_t virNetServerClientRead(virNetServerClientPtr client)
*/
static void virNetServerClientDispatchRead(virNetServerClientPtr client)
{
-readmore:
+ readmore:
if (client->rx->nfds == 0) {
if (virNetServerClientRead(client) < 0) {
client->wantClose = true;
@@ -1534,7 +1534,7 @@ virNetServerClientInitKeepAlive(virNetServerClientPtr client,
client->keepalive = ka;
-cleanup:
+ cleanup:
virObjectUnlock(client);
return ret;
@@ -1558,7 +1558,7 @@ virNetServerClientStartKeepAlive(virNetServerClientPtr client)
ret = virKeepAliveStart(client->keepalive, 0, 0);
-cleanup:
+ cleanup:
virObjectUnlock(client);
return ret;
}
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index 8aea9f0..a4d9295 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -175,7 +175,7 @@ virNetServerProgramSendError(unsigned program,
return 0;
-error:
+ error:
VIR_WARN("Failed to serialize remote error '%p'", rerr);
xdr_free((xdrproc_t)xdr_virNetMessageError, (void*)rerr);
return -1;
@@ -333,7 +333,7 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog,
return ret;
-error:
+ error:
if (msg->header.type == VIR_NET_CALL ||
msg->header.type == VIR_NET_CALL_WITH_FDS) {
ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header);
@@ -348,7 +348,7 @@ error:
ret = 0;
}
-cleanup:
+ cleanup:
return ret;
}
@@ -493,7 +493,7 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog,
/* Put reply on end of tx queue to send out */
return virNetServerClientSendMessage(client, msg);
-error:
+ error:
/* Bad stuff (de-)serializing message, but we have an
* RPC error message we can send back to the client */
rv = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header);
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 4113ec9..320a02c 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -85,7 +85,7 @@ static void virNetServerServiceAccept(virNetSocketPtr sock,
svc->dispatchFunc(svc, clientsock, svc->dispatchOpaque);
-cleanup:
+ cleanup:
virObjectUnref(clientsock);
}
@@ -142,7 +142,7 @@ virNetServerServicePtr virNetServerServiceNewTCP(const char *nodename,
return svc;
-error:
+ error:
virObjectUnref(svc);
return NULL;
}
@@ -206,7 +206,7 @@ virNetServerServicePtr virNetServerServiceNewUNIX(const char *path,
return svc;
-error:
+ error:
virObjectUnref(svc);
return NULL;
}
@@ -257,7 +257,7 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd,
return svc;
-error:
+ error:
virObjectUnref(svc);
return NULL;
}
@@ -338,7 +338,7 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj
return svc;
-error:
+ error:
virObjectUnref(svc);
return NULL;
}
@@ -381,7 +381,7 @@ virJSONValuePtr virNetServerServicePreExecRestart(virNetServerServicePtr svc)
return object;
-error:
+ error:
virJSONValueFree(object);
return NULL;
}
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 16a2521..2e94a6c 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -208,7 +208,7 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
return sock;
-error:
+ error:
sock->fd = sock->errfd = -1; /* Caller owns fd/errfd on failure */
virObjectUnref(sock);
return NULL;
@@ -320,7 +320,7 @@ int virNetSocketNewListenTCP(const char *nodename,
*nretsocks = nsocks;
return 0;
-error:
+ error:
for (i = 0; i < nsocks; i++)
virObjectUnref(socks[i]);
VIR_FREE(socks);
@@ -389,7 +389,7 @@ int virNetSocketNewListenUNIX(const char *path,
return 0;
-error:
+ error:
if (path[0] != '@')
unlink(path);
VIR_FORCE_CLOSE(fd);
@@ -506,7 +506,7 @@ int virNetSocketNewConnectTCP(const char *nodename,
return 0;
-error:
+ error:
freeaddrinfo(ai);
VIR_FORCE_CLOSE(fd);
return -1;
@@ -548,7 +548,7 @@ int virNetSocketNewConnectUNIX(const char *path,
if (remoteAddr.data.un.sun_path[0] == '@')
remoteAddr.data.un.sun_path[0] = '\0';
-retry:
+ retry:
if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) {
if ((errno == ECONNREFUSED ||
errno == ENOENT) &&
@@ -581,7 +581,7 @@ retry:
return 0;
-error:
+ error:
VIR_FORCE_CLOSE(fd);
return -1;
}
@@ -642,7 +642,7 @@ int virNetSocketNewConnectCommand(virCommandPtr cmd,
return 0;
-error:
+ error:
VIR_FORCE_CLOSE(sv[0]);
VIR_FORCE_CLOSE(sv[1]);
VIR_FORCE_CLOSE(errfd[0]);
@@ -845,7 +845,7 @@ virNetSocketNewConnectLibSSH2(const char *host,
VIR_FREE(authMethodsCopy);
return 0;
-error:
+ error:
virObjectUnref(sock);
virObjectUnref(sess);
VIR_FREE(authMethodsCopy);
@@ -1007,7 +1007,7 @@ virJSONValuePtr virNetSocketPreExecRestart(virNetSocketPtr sock)
virObjectUnlock(sock);
return object;
-error:
+ error:
virObjectUnlock(sock);
virJSONValueFree(object);
return NULL;
@@ -1145,7 +1145,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(sock);
return ret;
}
@@ -1230,7 +1230,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(sock);
return ret;
}
@@ -1272,7 +1272,7 @@ int virNetSocketGetSELinuxContext(virNetSocketPtr sock,
goto cleanup;
ret = 0;
-cleanup:
+ cleanup:
freecon(seccon);
virObjectUnlock(sock);
return ret;
@@ -1411,7 +1411,7 @@ static ssize_t virNetSocketReadWire(virNetSocketPtr sock, char *buf, size_t len)
return virNetSocketLibSSH2Read(sock, buf, len);
#endif
-reread:
+ reread:
#if WITH_GNUTLS
if (sock->tlsSession &&
virNetTLSSessionGetHandshakeStatus(sock->tlsSession) ==
@@ -1470,7 +1470,7 @@ static ssize_t virNetSocketWriteWire(virNetSocketPtr sock, const char *buf, size
return virNetSocketLibSSH2Write(sock, buf, len);
#endif
-rewrite:
+ rewrite:
#if WITH_GNUTLS
if (sock->tlsSession &&
virNetTLSSessionGetHandshakeStatus(sock->tlsSession) ==
@@ -1655,7 +1655,7 @@ int virNetSocketSendFD(virNetSocketPtr sock, int fd)
}
ret = 1;
-cleanup:
+ cleanup:
virObjectUnlock(sock);
return ret;
}
@@ -1689,7 +1689,7 @@ int virNetSocketRecvFD(virNetSocketPtr sock, int *fd)
"sock=%p fd=%d", sock, *fd);
ret = 1;
-cleanup:
+ cleanup:
virObjectUnlock(sock);
return ret;
}
@@ -1749,7 +1749,7 @@ int virNetSocketAccept(virNetSocketPtr sock, virNetSocketPtr *clientsock)
fd = -1;
ret = 0;
-cleanup:
+ cleanup:
VIR_FORCE_CLOSE(fd);
virObjectUnlock(sock);
return ret;
@@ -1824,7 +1824,7 @@ int virNetSocketAddIOCallback(virNetSocketPtr sock,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(sock);
if (ret != 0)
virObjectUnref(sock);
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 789ba2e..9d09699 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -192,7 +192,7 @@ virNetSSHSessionAuthMethodNew(virNetSSHSessionPtr sess)
return auth;
-error:
+ error:
VIR_FREE(auth);
return NULL;
}
@@ -267,7 +267,7 @@ virNetSSHKbIntCb(const char *name ATTRIBUTE_UNUSED,
responses[i].length = askcred[i].resultlen;
}
-cleanup:
+ cleanup:
if (askcred) {
for (i = 0; i < num_prompts; i++) {
char *prompt = (char *)askcred[i].prompt;
@@ -755,7 +755,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess,
else
return -1;
-cleanup:
+ cleanup:
VIR_FREE(password);
return ret;
}
@@ -1034,7 +1034,7 @@ virNetSSHSessionAuthAddPasswordAuth(virNetSSHSessionPtr sess,
virObjectUnlock(sess);
return 0;
-error:
+ error:
VIR_FREE(user);
virObjectUnlock(sess);
return -1;
@@ -1068,7 +1068,7 @@ virNetSSHSessionAuthAddAgentAuth(virNetSSHSessionPtr sess,
virObjectUnlock(sess);
return 0;
-error:
+ error:
VIR_FREE(user);
virObjectUnlock(sess);
return -1;
@@ -1111,7 +1111,7 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSessionPtr sess,
virObjectUnlock(sess);
return 0;
-error:
+ error:
VIR_FREE(user);
VIR_FREE(pass);
VIR_FREE(file);
@@ -1149,7 +1149,7 @@ virNetSSHSessionAuthAddKeyboardAuth(virNetSSHSessionPtr sess,
virObjectUnlock(sess);
return 0;
-error:
+ error:
VIR_FREE(user);
virObjectUnlock(sess);
return -1;
@@ -1222,7 +1222,7 @@ virNetSSHSessionSetHostKeyVerification(virNetSSHSessionPtr sess,
virObjectUnlock(sess);
return 0;
-error:
+ error:
virObjectUnlock(sess);
return -1;
}
@@ -1273,7 +1273,7 @@ virNetSSHSessionPtr virNetSSHSessionNew(void)
return sess;
-error:
+ error:
virObjectUnref(sess);
return NULL;
}
@@ -1330,7 +1330,7 @@ virNetSSHSessionConnect(virNetSSHSessionPtr sess,
virObjectUnlock(sess);
return ret;
-error:
+ error:
sess->state = VIR_NET_SSH_STATE_ERROR;
virObjectUnlock(sess);
return ret;
@@ -1439,11 +1439,11 @@ virNetSSHChannelRead(virNetSSHSessionPtr sess,
return -1;
}
-success:
+ success:
virObjectUnlock(sess);
return read_n;
-error:
+ error:
sess->state = VIR_NET_SSH_STATE_ERROR;
virObjectUnlock(sess);
return ret;
@@ -1501,7 +1501,7 @@ virNetSSHChannelWrite(virNetSSHSessionPtr sess,
_("write failed: %s"), msg);
}
-cleanup:
+ cleanup:
virObjectUnlock(sess);
return ret;
}
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 4eaf469..8693c61 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -537,7 +537,7 @@ static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile,
ret = 0;
-cleanup:
+ cleanup:
if (ret != 0) {
gnutls_x509_crt_deinit(cert);
cert = NULL;
@@ -575,7 +575,7 @@ static int virNetTLSContextLoadCACertListFromFile(const char *certFile,
ret = 0;
-cleanup:
+ cleanup:
VIR_FREE(buf);
return ret;
}
@@ -616,7 +616,7 @@ static int virNetTLSContextSanityCheckCredentials(bool isServer,
ret = 0;
-cleanup:
+ cleanup:
if (cert)
gnutls_x509_crt_deinit(cert);
for (i = 0; i < ncacerts; i++)
@@ -699,7 +699,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSContextPtr ctxt,
ret = 0;
-cleanup:
+ cleanup:
return ret;
}
@@ -783,7 +783,7 @@ static virNetTLSContextPtr virNetTLSContextNew(const char *cacert,
return ctxt;
-error:
+ error:
if (isServer)
gnutls_dh_params_deinit(ctxt->dhParams);
gnutls_certificate_free_credentials(ctxt->x509cred);
@@ -906,7 +906,7 @@ static int virNetTLSContextLocateCredentials(const char *pkipath,
return 0;
-error:
+ error:
VIR_FREE(*cacert);
VIR_FREE(*cacrl);
VIR_FREE(*key);
@@ -1117,14 +1117,14 @@ static int virNetTLSContextValidCertificate(virNetTLSContextPtr ctxt,
return 0;
-authdeny:
+ authdeny:
PROBE(RPC_TLS_CONTEXT_SESSION_DENY,
"ctxt=%p sess=%p dname=%s",
ctxt, sess, dnameptr);
return -1;
-authfail:
+ authfail:
PROBE(RPC_TLS_CONTEXT_SESSION_FAIL,
"ctxt=%p sess=%p",
ctxt, sess);
@@ -1153,7 +1153,7 @@ int virNetTLSContextCheckCertificate(virNetTLSContextPtr ctxt,
ret = 0;
-cleanup:
+ cleanup:
virObjectUnlock(ctxt);
virObjectUnlock(sess);
@@ -1264,7 +1264,7 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt,
return sess;
-error:
+ error:
virObjectUnref(sess);
return NULL;
}
@@ -1311,7 +1311,7 @@ ssize_t virNetTLSSessionWrite(virNetTLSSessionPtr sess,
ret = -1;
-cleanup:
+ cleanup:
virObjectUnlock(sess);
return ret;
}
@@ -1341,7 +1341,7 @@ ssize_t virNetTLSSessionRead(virNetTLSSessionPtr sess,
ret = -1;
-cleanup:
+ cleanup:
virObjectUnlock(sess);
return ret;
}
@@ -1373,7 +1373,7 @@ int virNetTLSSessionHandshake(virNetTLSSessionPtr sess)
gnutls_strerror(ret));
ret = -1;
-cleanup:
+ cleanup:
virObjectUnlock(sess);
return ret;
}
@@ -1406,7 +1406,7 @@ int virNetTLSSessionGetKeySize(virNetTLSSessionPtr sess)
goto cleanup;
}
-cleanup:
+ cleanup:
virObjectUnlock(sess);
return ssf;
}
--
1.8.3.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list