External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

remote: stop declaring variables in the middle of a function

Browse Source 
The doRemoteOpen method was a little unusual in declaring a bunch of
local variables in the middle of the function. Move them to the top as
it is normal libvirt style.

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-07-03 18:52:32 +01:00
parent b5ee13e329
commit 9d9b19c0b7
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/remote/remote_driver.c
View File

@ -789,6 +789,22 @@ doRemoteOpen(virConnectPtr conn,
char *daemonPath = NULL;
#endif
char *tls_priority = NULL;
char *name = NULL;
char *command = NULL;
char *sockname = NULL;
char *netcat = NULL;
char *port = NULL;
char *authtype = NULL;
char *username = NULL;
char *pkipath = NULL;
char *keyfile = NULL;
char *sshauth = NULL;
char *knownHostsVerify = NULL;
char *knownHosts = NULL;
bool sanity = true;
bool verify = true;
bool tty ATTRIBUTE_UNUSED = true;
int retcode = VIR_DRV_OPEN_ERROR;
/* We handle *ALL* URIs here. The caller has rejected any
* URIs we don't care about */
@ -848,18 +864,6 @@ doRemoteOpen(virConnectPtr conn,
return VIR_DRV_OPEN_ERROR;
}
/* Local variables which we will initialize. These can
* get freed in the failed: path.
*/
char *name = NULL, *command = NULL, *sockname = NULL, *netcat = NULL;
char *port = NULL, *authtype = NULL, *username = NULL;
bool sanity = true, verify = true, tty ATTRIBUTE_UNUSED = true;
char *pkipath = NULL, *keyfile = NULL, *sshauth = NULL;
char *knownHostsVerify = NULL, *knownHosts = NULL;
/* Return code from this function, and the private data. */
int retcode = VIR_DRV_OPEN_ERROR;
/* Remote server defaults to "localhost" if not specified. */
if (conn->uri && conn->uri->port != 0) {