NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tools: rename 'socket' to 'sockpath'

Browse Source 
A variable named 'socket' clashes with the function of the same
name, causing build failures due to warnings on some platforms.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-08-02 11:51:08 +01:00
parent d8447faa61
commit 376cfc2a81
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/virsh-domain.c
View File

@ -10949,7 +10949,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd)
char *listen_addr = NULL; char *listen_addr = NULL;
int port, tls_port = 0; int port, tls_port = 0;
char *type_conn = NULL; char *type_conn = NULL;
char *socket = NULL; char *sockpath = NULL;
char *passwd = NULL; char *passwd = NULL;
char *output = NULL; char *output = NULL;
const char *scheme[] = { "vnc", "spice", "rdp", NULL }; const char *scheme[] = { "vnc", "spice", "rdp", NULL };
@ -11030,17 +11030,17 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd)
VIR_FREE(xpath); VIR_FREE(xpath);
if (STREQ_NULLABLE(type_conn, "socket")) { if (STREQ_NULLABLE(type_conn, "socket")) {
if (!socket) { if (!sockpath) {
if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@socket") < 0) if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@socket") < 0)
goto cleanup; goto cleanup;
socket = virXPathString(xpath, ctxt); sockpath = virXPathString(xpath, ctxt);
VIR_FREE(xpath); VIR_FREE(xpath);
} }
} }
if (!port && !tls_port && !socket) if (!port && !tls_port && !sockpath)
continue; continue;
if (!listen_addr) { if (!listen_addr) {
@ -11098,7 +11098,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd)
VIR_FREE(xpath); VIR_FREE(xpath);
/* Build up the full URI, starting with the scheme */ /* Build up the full URI, starting with the scheme */
if (socket) if (sockpath)
virBufferAsprintf(&buf, "%s+unix://", scheme[iter]); virBufferAsprintf(&buf, "%s+unix://", scheme[iter]);
else else
virBufferAsprintf(&buf, "%s://", scheme[iter]); virBufferAsprintf(&buf, "%s://", scheme[iter]);
@ -11108,17 +11108,17 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd)
virBufferAsprintf(&buf, ":%s@", passwd); virBufferAsprintf(&buf, ":%s@", passwd);
/* Then host name or IP */ /* Then host name or IP */
if (!listen_addr && !socket) if (!listen_addr && !sockpath)
virBufferAddLit(&buf, "localhost"); virBufferAddLit(&buf, "localhost");
else if (!socket && strchr(listen_addr, ':')) else if (!sockpath && strchr(listen_addr, ':'))
virBufferAsprintf(&buf, "[%s]", listen_addr); virBufferAsprintf(&buf, "[%s]", listen_addr);
else if (socket) else if (sockpath)
virBufferAsprintf(&buf, "%s", socket); virBufferAsprintf(&buf, "%s", sockpath);
else else
virBufferAsprintf(&buf, "%s", listen_addr); virBufferAsprintf(&buf, "%s", listen_addr);
/* Free socket to prepare the pointer for the next iteration */ /* Free socket to prepare the pointer for the next iteration */
VIR_FREE(socket); VIR_FREE(sockpath);
/* Add the port */ /* Add the port */
if (port) { if (port) {
@ -11177,7 +11177,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd)
cleanup: cleanup:
VIR_FREE(xpath); VIR_FREE(xpath);
VIR_FREE(type_conn); VIR_FREE(type_conn);
VIR_FREE(socket); VIR_FREE(sockpath);
VIR_FREE(passwd); VIR_FREE(passwd);
VIR_FREE(listen_addr); VIR_FREE(listen_addr);
VIR_FREE(output); VIR_FREE(output);