External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 00:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: avoid shadowing devname() on BSD systems

Browse Source 
* tools/virsh.c (cmdRunConsole, cmdConsole): Rename problematic
symbol.
Reported by Justin Clift.
This commit is contained in:
Eric Blake 2010-12-03 08:26:40 -07:00
parent 2636f50842
commit c6506ff8e9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/virsh.c
View File

@ -732,7 +732,7 @@ static const vshCmdOptDef opts_console[] = {
}; };
static int static int
cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *devname) cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name)
{ {
int ret = FALSE; int ret = FALSE;
virDomainInfo dominfo; virDomainInfo dominfo;
@ -749,7 +749,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *devname)
vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom)); vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom));
vshPrintExtra(ctl, "%s", _("Escape character is ^]\n")); vshPrintExtra(ctl, "%s", _("Escape character is ^]\n"));
if (vshRunConsole(dom, devname) == 0) if (vshRunConsole(dom, name) == 0)
ret = TRUE; ret = TRUE;
cleanup: cleanup:
@ -762,7 +762,7 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd)
{ {
virDomainPtr dom; virDomainPtr dom;
int ret; int ret;
const char *devname; const char *name;
if (!vshConnectionUsability(ctl, ctl->conn)) if (!vshConnectionUsability(ctl, ctl->conn))
return FALSE; return FALSE;
@ -770,9 +770,9 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd)
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return FALSE; return FALSE;
devname = vshCommandOptString(cmd, "devname", NULL); name = vshCommandOptString(cmd, "devname", NULL);
ret = cmdRunConsole(ctl, dom, devname); ret = cmdRunConsole(ctl, dom, name);
virDomainFree(dom); virDomainFree(dom);
return ret; return ret;