提交 9d9b19c0 编写于 作者: D Daniel P. Berrangé

remote: stop declaring variables in the middle of a function

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: NFabiano Fidêncio <fidencio@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 b5ee13e3
...@@ -789,6 +789,22 @@ doRemoteOpen(virConnectPtr conn, ...@@ -789,6 +789,22 @@ doRemoteOpen(virConnectPtr conn,
char *daemonPath = NULL; char *daemonPath = NULL;
#endif #endif
char *tls_priority = NULL; 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 /* We handle *ALL* URIs here. The caller has rejected any
* URIs we don't care about */ * URIs we don't care about */
...@@ -848,18 +864,6 @@ doRemoteOpen(virConnectPtr conn, ...@@ -848,18 +864,6 @@ doRemoteOpen(virConnectPtr conn,
return VIR_DRV_OPEN_ERROR; 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. */ /* Remote server defaults to "localhost" if not specified. */
if (conn->uri && conn->uri->port != 0) { if (conn->uri && conn->uri->port != 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册